Anpassungen für die neuen Software versionen der V963

git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6045 504e572c-2e33-0410-9681-be2bf7408885
2011-03-11 20:24:58 +00:00 · 2011-03-11 20:24:58 +00:00 · 34cb431af5
commit 34cb431af5
parent c125d3d2ba
74 changed files with 314 additions and 467 deletions
--- a/SysBuild/BuildCluster/BaseSysTools.dmk
+++ b/SysBuild/BuildCluster/BaseSysTools.dmk
@ -90,7 +90,6 @@
 0       network/aircrack-ng
 0       network/ppp
 0       dbase/gdbm
-0	network/libproxy
 0	tools/dbus-glib
 0	tools/dbus-python
 0	tools/eggdbus
@ -101,10 +100,9 @@
 0       network/netkit-bootparamd
 0       network/tsocks
 0	network/tcp_wrappers
+0	network/libtirpc
 0       network/nfs-utils
 0       network/traceroute
-0       multimedia/openal-soft
-0	multimedia/freealut
 0       network/pam_smb
 0       multimedia/audiofile
 0       multimedia/toolame
@ -127,8 +125,6 @@
 0	network/glusterfs
 0	tools/texi2roff
 0       tools/mgetty
-#keine Neue Version, Nich mehr kompilierbar - überflüssig ??
-#0       tools/isapnptools
 0       tools/autofs
 0       multimedia/cdparanoia-III
 0       tools/recode
@ -143,6 +139,9 @@
 0       tools/psutils
 0       tools/hdparm
 0	development/cmake
+0	network/libproxy
+0       multimedia/openal-soft
+0	multimedia/freealut
 0	network/libmsn
 0	network/libssh
 0	tools/libcap
@ -162,7 +161,8 @@
 0       multimedia/divx611
 0       tools/bonnie++
 0       tools/rarlinux
-0       tools/CDspindown
+#Wird nicht mehr weiterentwickelt und KOmpiliert gar nimmer
+#0       tools/CDspindown
 0       tools/doxygen
 0       tools/dvd+rw-tools
 0       dbase/db
@ -173,8 +173,6 @@
 0       network/lynx
 0	network/neon
 0	dbase/sqlite-amalgamation
-#Is already done - aber hier sollte die neueste Version gebaut werden
-4	development/subversion
 0	network/apr
 0       tools/zisofs-tools
 0       tools/nagios
--- a/SysBuild/BuildCluster/XTools.dmk
+++ b/SysBuild/BuildCluster/XTools.dmk
@ -1,4 +1,6 @@
 0	development/Xdialog
+#Is already done - aber hier sollte die neueste Version gebaut werden
+4	development/subversion
 0	network/gftp
 0	multimedia/mjpegtools
 0	multimedia/gst-plugins-good
--- a/SysBuild/dbase/db
+++ b/SysBuild/dbase/db
@ -92,8 +92,7 @@ mk32() {
 			      --enable-compat185 \
 		              --enable-cxx \
 		              --enable-tcl \
-		              --with-tcl=/usr/X11R7/lib \
-		              --enable-rpc &&
+		              --with-tcl=/usr/X11R7/lib &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	cd ../db*
@ -104,12 +103,6 @@ mk32() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64 \
-		            --with-tcl=/usr/X11R7/lib64"
-	else
-		ADDOPTIONS="--with-tcl=/usr/X11R7/lib"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
@ -120,8 +113,8 @@ mk() {
            	    	      --enable-compat185 \
 	    	    	      --enable-cxx \
 	    	    	      --enable-tcl \
-		    	      $ADDOPTIONS \
-	    	    	      --enable-rpc &&
+		    	      --with-tcl=/usr/X11R7/${LIBDIR} \
+			      --libdir=/usr/${LIBDIR} &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
 }
--- a/SysBuild/dbase/gdbm
+++ b/SysBuild/dbase/gdbm
@ -84,15 +84,6 @@ mk32() {
 	CXX="g++ $BUILDOPTIONS32 -fPIC" \
 	./configure --prefix=/usr &&
 	make -j $NUMCPU &&
-	mkdir tmplib &&
-	cd tmplib &&
-	ar -x ../.libs/libgdbm.a &&
-	gcc -shared -m32 -Wl,-soname,libgdbm.so.3 -o ../.libs/libgdbm.so.3.0.0 *.o &&
-	rm -r *.o &&
-	ar -x ../.libs/libgdbm_compat.a &&
-	gcc -shared -m32 -Wl,-soname,libgdbm_compat.so.3 -o ../.libs/libgdbm_compat.so.3.0.0 *.o &&
-	cd .. &&
-	rm -r tmplib &&
 	make -j $NUMCPU INSTALL_ROOT=$TMPROOT install
 	make -j $NUMCPU INSTALL_ROOT=$TMPROOT install-compat
 	make distclean
@ -100,23 +91,11 @@ mk32() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
-	./configure $ADDOPTIONS \
+	./configure --libdir=/usr/${LIBDIR} \
 	            --prefix=/usr &&
 	make -j $NUMCPU &&
-	mkdir tmplib &&
-	cd tmplib &&
-	ar -x ../.libs/libgdbm.a &&
-	gcc $BUILDOPTIONS -shared -Wl,-soname,libgdbm.so.3 -o ../.libs/libgdbm.so.3.0.0 *.o &&
-	rm -r *.o &&
-	ar -x ../.libs/libgdbm_compat.a &&
-	gcc $BUILDOPTIONS -shared -Wl,-soname,libgdbm_compat.so.3 -o ../.libs/libgdbm_compat.so.3.0.0 *.o &&
-	cd .. &&
-	rm -r tmplib &&
 	make -j $NUMCPU INSTALL_ROOT=$TMPROOT install &&
 	make -j $NUMCPU INSTALL_ROOT=$TMPROOT install-compat
 }
--- a/SysBuild/dbase/mysql
+++ b/SysBuild/dbase/mysql
@ -75,56 +75,45 @@ SRCPATH=DBase/Server


 premk() {
-	echo "Nothing to do for premk()"
+	mkdir build
+	cd build
 }

 mk32() {
-	CC="gcc $BUILDOPTIONS32 -fPIC" \
-	CXX="g++ $BUILDOPTIONS32 -fPIC" \
-	USE_ARCH=$UARCH \
-	./configure --target=$TARGET32 \
-		    --sysconfdir=/etc \
-		    --prefix=/opt/MySQL \
-		    --libexecdir=\${prefix}/sbin \
-		    --enable-assembler \
-		    --with-gnu-ld \
-		    --with-server-suffix=CompuExtreme \
-		    --with-pthread \
-		    --with-mysqld-user=mysql \
-		    --with-ssl \
-		    --with-embedded-server &&
+	USE_ARCH=32 \
+	cmake -DCMAKE_INSTALL_PREFIX=/opt/MySQL \
+	      -DCMAKE_CXX_FLAGS="$BUILDOPTIONS32" \
+	      -DCMAKE_C_FLAGS="$BUILDOPTIONS32" \
+	      -DSYSCONFDIR=/etc \
+	      ..
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
 	CheckError "Make install process failed !" 1
 	make distclean
-	ClearHostSysNameing32 $TMPROOT
+	#ClearHostSysNameing32 $TMPROOT
 	mv $TMPROOT/opt/MySQL/bin/mysql_config{,-32}
-	GenDynLib32 $TMPROOT/opt/MySQL/lib/mysql/libmysqld.a 16.0.0
+	#GenDynLib32 $TMPROOT/opt/MySQL/lib/mysql/libmysqld.a 16.0.0
+	cd ..
+	rm -r build
+	mkdir build
+	cd build
 }

 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
+		ADDOPTIONS="-DLIB_SUFFIX=64"
 	fi
-	CC="gcc $BUILDOPTIONS -fPIC" \
-	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
-	./configure --target=$TARGET \
-		    --sysconfdir=/etc \
-		    --prefix=/opt/MySQL \
-		    $ADDOPTIONS \
-		    --libexecdir=\${prefix}/sbin \
-		    --enable-assembler \
-		    --with-gnu-ld \
-		    --with-server-suffix=CompuExtreme \
-		    --with-pthread \
-		    --with-mysqld-user=mysql \
-		    --with-ssl \
-		    --with-embedded-server &&
+	cmake -DCMAKE_INSTALL_PREFIX=/opt/MySQL \
+	      -DINSTALL_LIBDIR=/opt/MySQL/lib64 \
+	      -DCMAKE_CXX_FLAGS="$BUILDOPTIONS" \
+	      -DCMAKE_C_FLAGS="$BUILDOPTIONS" \
+	      -DSYSCONFDIR=/etc \
+	      ..
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
 	CheckError "Make install process failed !" 1
-	GenDynLib $TMPROOT/opt/MySQL/$LIBDIR/mysql/libmysqld.a 16.0.0
+	#GenDynLib $TMPROOT/opt/MySQL/$LIBDIR/mysql/libmysqld.a 16.0.0
 }

 postmk() {
@ -141,5 +130,6 @@ postmk() {
 		mv $TMPROOT/opt/MySQL/bin/mysql_config{,-64}
 		ln -s /usr/bin/multiarch_wrapper $TMPROOT/opt/MySQL/bin/mysql_config
 	fi
+	sed -i "s%^\(basedir=\).*$%\1\"/opt/MySQL\"%" $TMPROOT/opt/MySQL/scripts/mysql_install_db
 	CheckError "postmk() failed !" 1
 }
--- a/SysBuild/dbase/sqlite-amalgamation
+++ b/SysBuild/dbase/sqlite-amalgamation
@ -90,14 +90,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/development/Digest-SHA1
+++ b/SysBuild/development/Digest-SHA1
@ -88,7 +88,6 @@ mk32() {
 	mkdir -p $INSTLIB
 	touch $INSTLIB/perllocal.pod

-
 	# Make install Optionen eintragen
 	make -j $NUMCPU install
 	CheckError "Make install process failed !" 1
@ -112,8 +111,5 @@ mk() {
 }

 postmk() {
-#	cd $INSTLIB
-#	sed -e "s%$TMPROOT%%" perllocal.pod >/tmp/perllocal.pod
-#	mv /tmp/perllocal.pod perllocal.pod
 	echo "Nothing to do for postmk()"
 }
--- a/SysBuild/development/MP3-Tag
+++ b/SysBuild/development/MP3-Tag
@ -110,8 +110,5 @@ mk() {
 }

 postmk() {
-#	cd $INSTLIB
-#	sed -e "s%$TMPROOT%%" perllocal.pod >/tmp/perllocal.pod
-#	mv /tmp/perllocal.pod perllocal.pod
 	echo "Nothing to do for postmk()"
 }
--- a/SysBuild/development/PDL
+++ b/SysBuild/development/PDL
@ -89,12 +89,12 @@ mk32() {
 	CheckError "Configurescript failed !" 1
 	
 	# Make-Optionen eintragen
-	make -j $NUMCPU 
-	make -j $NUMCPU doctest
+	make 
+	make doctest
 	CheckError "Makeprocess failed  !" 1
 	
 	# Make install Optionen eintragen
-	make -j $NUMCPU PREFIX=$TMPROOT/usr install
+	make PREFIX=$TMPROOT/usr install
 	CheckError "Make install process failed !" 1
 	make distclean
 	unset USE_ARCH
@ -108,12 +108,12 @@ mk() {
 	CheckError "Configurescript failed !" 1
 	
 	# Make-Optionen eintragen
-	make -j $NUMCPU 
-	make -j $NUMCPU doctest
+	make
+	make doctest
 	CheckError "Makeprocess failed  !" 1
 	
 	# Make install Optionen eintragen
-	make -j $NUMCPU PREFIX=$TMPROOT/usr install
+	make PREFIX=$TMPROOT/usr install
 	CheckError "Make install process failed !" 1
 	unset USE_ARCH
 	unset LDEMULATION
--- a/SysBuild/development/Python
+++ b/SysBuild/development/Python
@ -98,7 +98,6 @@ mk32() {

 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
 		SrcPatch $MAKEDIR/Python* $LFSSOURCE/$SRCPATH/Python-*-multilib-*.patch.*
 		sed -i -e "s:@@MULTILIB_DIR@@:lib64:g" \
 	        	Lib/distutils/command/install.py \
@ -112,7 +111,7 @@ mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --with-signal-module \
 		    --with-threads \
 		    --with-cycle-gc \
--- a/SysBuild/development/tcl
+++ b/SysBuild/development/tcl
@ -97,16 +97,13 @@ mk32() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/X11R7/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
 		    --prefix=/usr/X11R7 \
 		    --enable-threads \
-		    $ADDOPTIONS \
+		    --libdir=/usr/X11R7/${LIBDIR} \
 		    --enable-shared &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU INSTALL_ROOT=$TMPROOT install 
--- a/SysBuild/multimedia/a52dec
+++ b/SysBuild/multimedia/a52dec
@ -91,25 +91,20 @@ mk32() {
 	make -j $NUMCPU 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
-	GenDynLib32 $TMPROOT/usr/lib/liba52.a 0.7.4
 }

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
            	    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --enable-shared \
 		    --enable-double
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
-	GenDynLib $TMPROOT/usr/$LIBDIR/liba52.a 0.7.4
 }

 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
--- a/SysBuild/multimedia/audiofile
+++ b/SysBuild/multimedia/audiofile
@ -91,25 +91,20 @@ mk32() {
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
 	CheckError "Make install process failed !" 1
 	make distclean
-	GenDynLib32 $TMPROOT/usr/lib/libaudiofile.a 0.2.6
 	mv $TMPROOT/usr/bin/audiofile-config{,-32}
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
        	    --prefix=/usr \
 		    --with-gnu-ld &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	CheckError "Make install process failed !" 1
-	GenDynLib $TMPROOT/usr/$LIBDIR/libaudiofile.a 0.2.6
 }

 postmk() {
--- a/SysBuild/multimedia/bladeenc
+++ b/SysBuild/multimedia/bladeenc
@ -76,11 +76,9 @@ SRCPATH=MultiMedia/Apps

 premk() {
 	echo "Nothing to do for premk()"
-	CheckError "premk() failed !" 1
 }

 mk() {
-	# Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen.
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUIILDOPTIONS" \
 	./configure --host=$TARGET \
@ -91,5 +89,4 @@ mk() {

 postmk() {
 	echo "Nothing to do for postmk()"
-	CheckError "postmk() failed !" 1
 }
--- a/SysBuild/multimedia/cdparanoia-III
+++ b/SysBuild/multimedia/cdparanoia-III
@ -93,11 +93,8 @@ mk32() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	./configure --build=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr &&
 	make CFLAGS="$BUILDOPTIONS -fPIC" &&
 	make CFLAGS="$BUILDOPTIONS -fPIC" prefix=$TMPROOT/usr install
--- a/SysBuild/multimedia/celt
+++ b/SysBuild/multimedia/celt
@ -85,14 +85,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR" \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/multimedia/freealut
+++ b/SysBuild/multimedia/freealut
@ -89,14 +89,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$BUILDSYS \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/multimedia/jack
+++ b/SysBuild/multimedia/jack
@ -92,13 +92,10 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --enable-optimize
 	make -j $NUMCPU
--- a/SysBuild/multimedia/lame
+++ b/SysBuild/multimedia/lame
@ -94,14 +94,11 @@ mk32() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET  \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr  &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU prefix=$TMPROOT/usr install 
--- a/SysBuild/multimedia/libmusicbrainz
+++ b/SysBuild/multimedia/libmusicbrainz
@ -89,17 +89,13 @@ mk32() {

 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		      -DLIB_SUFFIX=$UARCH \
-		      CC="gcc $BUILDOPTIONS" \
-		      CXX="g++ $BUILDOPTIONS" \
-		      USE_ARCH=$UARCH .
-	else
-		cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		      CC="gcc $BUILDOPTIONS" \
-		      CXX="g++ $BUILDOPTIONS" \
-		      USE_ARCH=$UARCH .
+		ADDOPTIONS="-DLIB_SUFFIX=$UARCH"
 	fi
+	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+	      $ADDOPTIONS \
+	      CC="gcc $BUILDOPTIONS" \
+	      CXX="g++ $BUILDOPTIONS" \
+	      USE_ARCH=$UARCH .
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
--- a/SysBuild/multimedia/libsndfile
+++ b/SysBuild/multimedia/libsndfile
@ -88,13 +88,10 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/multimedia/normalize
+++ b/SysBuild/multimedia/normalize
@ -77,13 +77,10 @@ premk() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ];then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/multimedia/openal-soft
+++ b/SysBuild/multimedia/openal-soft
@ -72,40 +72,38 @@
 SRCPATH=MultiMedia/Lib

 premk() {
-	echo "Nothing to do for premk()"
+	mkdir build
+	cd build
 }

 mk32() {
-	CC="gcc $BUILDOPTIONS32" \
-	CXX="g++ $BUILDOPTIONS32" \
-	USE_ARCH=$UARCH \
-	./configure --build=$TARGET32 \
-		    --prefix=/usr
-	make 
-	make DESTDIR=$TMPROOT install
-	make distclean
-	mv $TMPROOT/usr/bin/openal-config{,-32}
+	USE_ARCH=32 \
+	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+	      -DCMAKE_CXX_FLAGS="$BUILDOPTIONS32" \
+	      -DCMAKE_C_FLAGS="$BUILDOPTIONS32" \
+	      ..
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	cd ..
+	rm -r build
+	mkdir build
+	cd build
 }

 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
+		ADDOPTIONS="-DLIB_SUFFIX=64"
 	fi
-	CC="gcc $BUILDOPTIONS" \
-	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure --build=$BUILDSYS \
-		    $ADDOPTIONS \
-		    --prefix=/usr
+	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+	      $ADDOPTIONS \
+	      -DCMAKE_CXX_FLAGS="$BUILDOPTIONS" \
+	      -DCMAKE_C_FLAGS="$BUILDOPTIONS" \
+	      ..
 	make 
 	make DESTDIR=$TMPROOT install
-	cd -
 }

 postmk() {
-	if [ "$MK64BIT" == "true" ]; then
-		mv $TMPROOT/usr/bin/openal-config{,-64}
-		ln -s multiarch_wrapper $TMPROOT/usr/bin/openal-config
-	fi
-	ClearHostSysNameing $TMPROOT
+	echo "Nothing to do for postmk()"
 }
--- a/SysBuild/multimedia/ptlib
+++ b/SysBuild/multimedia/ptlib
@ -82,6 +82,7 @@ premk() {
 	echo "Nothing to do for premk"
 	PWLIBDIR=`pwd`
 	mkdir -p $TMPROOT/usr/lib
+	find . -type f -exec sed -i "s/\r$//" {} \;
 }

 mk32() {
@ -104,19 +105,18 @@ mk32() {
 	make -k -j $NUMCPU DESTDIR=$TMPROOT install
 	chmod -v 755 $TMPROOT/usr/lib/libpt_linux*so*
 	mv $TMPROOT/usr/bin/ptlib-config{,-32}
-	sed -i -e "s/lib64/lib" $TMPROOT/usr/bin/ptlib-config-32
+	sed -i -e "s/lib64/lib/" $TMPROOT/usr/bin/ptlib-config-32
 	mv $TMPROOT/usr/include/ptbuildopts{,-32}.h
 	mv $TMPROOT/usr/lib $TMPROOT/usr/lib32
 	cd ..
 	rm -r ptlib*
-	UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/ptlib-*-src.tar.gz
+	UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/ptlib-*-src.tar.bz2
 	cd $MAKEDIR/ptlib*
+	find . -type f -exec sed -i "s/\r$//" {} \;
 }
+
 mk() {
 	sed -i -e "s:/share/pwlib:/lib/pwlib:g" Makefile.in
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${PREFIX}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
@ -127,7 +127,7 @@ mk() {
 		    --enable-v4l2 \
 		    --enable-alsa \
 		    --enable-oss \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	touch $TARGET
 	unset TARGET
--- a/SysBuild/multimedia/sbc
+++ b/SysBuild/multimedia/sbc
@ -88,14 +88,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --sysconfdir=/etc/sysconfig
 	make -j $NUMCPU
--- a/SysBuild/multimedia/speex
+++ b/SysBuild/multimedia/speex
@ -87,15 +87,12 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/network/aircrack-ng
+++ b/SysBuild/network/aircrack-ng
@ -75,11 +75,12 @@ SRCPATH=Network/Other

 premk() {
 	sed -i -e "s%/usr/local%/usr%g" common.mak
+	sed -i "s/-Werror/-Wall/g" common.mak
 }

 mk() {
-	make -j $NUMCPU
-	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make 
+	make DESTDIR=$TMPROOT install
 }

 postmk() {
--- a/SysBuild/network/apr
+++ b/SysBuild/network/apr
@ -87,13 +87,10 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/network/bind
+++ b/SysBuild/network/bind
@ -81,14 +81,11 @@ premk() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-	            $ADDOPTIONS \
+	            --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr \
 		    --sysconfdir=/etc \
 		    --enable-threads
--- a/SysBuild/network/bridge-utils
+++ b/SysBuild/network/bridge-utils
@ -79,12 +79,9 @@ premk() {

 mk() {
 	autoconf
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/network/drbd
+++ b/SysBuild/network/drbd
@ -75,14 +75,11 @@ premk() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --sysconfdir=/etc \
 		    --with-udev \
 		    --with-initdir \
--- a/SysBuild/network/glusterfs
+++ b/SysBuild/network/glusterfs
@ -88,13 +88,10 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --sysconfdir=/etc \
 		    --localstatedir=/var \
 		    --prefix=/usr
--- a/SysBuild/network/inetutils
+++ b/SysBuild/network/inetutils
@ -120,18 +120,24 @@ CXX="g++ $BUILDOPTIONS" \
 	make -j $NUMCPU &&
 	mkdir $TMPROOT/{talkd,telnetd,tftpd,ftpd,rlogind}
 	BUILDDIR=`pwd`
-	for k in talkd telnetd tftpd ftpd rexecd rlogind rshd; do
+	for k in talkd telnetd ftpd; do
 		cd $k
 		make -j $NUMCPU
 		make -j $NUMCPU DESTDIR=$TMPROOT/$k install 
 		cd $BUILDDIR
 	done
-	for k in rexecd rlogind rshd; do
-		cd $k
-		make -j $NUMCPU DESTDIR=$TMPROOT/rlogind install
-		cd $BUILDDIR
+	mkdir -p $TMPROOT/rlogind/usr/sbin
+	mkdir -p $TMPROOT/rlogind/usr/share/man/man8
+	mkdir -p $TMPROOT/rlogind/etc/xinetd.d
+	for k in rlogind rshd rexecd; do
+		install -m 755 src/$k $TMPROOT/rlogind/usr/sbin/$k
+		install -m 666 man/$k.8 $TMPROOT/rlogind/usr/share/man/man8/$k.8
 	done
-	ClearHostSysNameing $TMPROOT
+	mkdir -p $TMPROOT/tftpd/usr/sbin
+	mkdir -p $TMPROOT/tftpd/usr/share/man/man8
+	mkdir -p $TMPROOT/tftpd/etc/xinetd.d
+	install -m 755 src/tftpd $TMPROOT/tftpd/usr/sbin/tftpd
+	install -m 666 man/tftpd.8 $TMPROOT/tftpd/usr/share/man/man8/tftpd.8
 }

 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
--- a/SysBuild/network/libbind
+++ b/SysBuild/network/libbind
@ -90,14 +90,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/network/libmsn
+++ b/SysBuild/network/libmsn
@ -81,14 +81,13 @@ mk32() {
 	mkdir -v build &&
 	cd build &&
 	USE_ARCH=32 \
-	CC="gcc $BUILDOPTIONS32 -L/opt/kde/lib" \
-	CXX="g++ $BUILDOPTIONS32 -L/opt/kde/lib" \
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32" \
 	LDEMULATION="elf32_i386" \
 	cmake -DCMAKE_INSTALL_PREFIX=/usr \
 	      -DCMAKE_BUILD_TYPE=Release \
-	      -DCMAKE_C_FLAGS="${BUILDOPTIONS32}" \
-	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS32}" \
-	      -DLIB_SUFFIX= \
+	      -DCMAKE_C_FLAGS="${BUILDOPTIONS32} -fabi-version=2" \
+	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS32} -fabi-version=2" \
 	      .. &&
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
@ -113,8 +112,8 @@ mk() {
 	cmake -DCMAKE_INSTALL_PREFIX=/usr \
 	      -DLIB_INSTALL_DIR=/usr/$LIBDIR \
 	      -DCMAKE_BUILD_TYPE=Release \
-	      -DCMAKE_C_FLAGS="${BUILDOPTIONS}" \
-	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS}" \
+	      -DCMAKE_C_FLAGS="${BUILDOPTIONS} -fabi-version=2" \
+	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS} -fabi-version=2" \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
 	make -j $NUMCPU
--- a/SysBuild/network/libpcap
+++ b/SysBuild/network/libpcap
@ -92,14 +92,11 @@ mk32() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr && 
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
--- a/SysBuild/network/libproxy
+++ b/SysBuild/network/libproxy
@ -76,35 +76,39 @@
 SRCPATH=Network/Lib

 premk() {
-	echo "Nothing to do for premk()"
+	mkdir build
+	cd build
 }

 mk32() {
-	CC="gcc $BUILDOPTIONS32" \
-	CXX="g++ $BUILDOPTIONS32" \
-	USE_ARCH=$UARCH \
-	./configure --target=$TARGET32 \
-		    --prefix=/usr
+	USE_ARCH=32 \
+	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+	      -DCMAKE_CXX_FLAGS="$BUILDOPTIONS32" \
+	      -DCMAKE_C_FLAGS="$BUILDOPTIONS32" \
+	      ..
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	ClearHostSysNameing32 $TMPROOT
-	make distclean
+	cd ..
+	rm -r build
+	mkdir build
+	cd build
 }

 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
+		ADDOPTIONS="-DLIB_SUFFIX=64"
 	fi
-	CC="gcc $BUILDOPTIONS" \
-	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure --target=$TARGET \
-		    $ADDOPTIONS \
-		    --prefix=/usr
+	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+	      $ADDOPTIONS \
+	      -DCMAKE_CXX_FLAGS="$BUILDOPTIONS" \
+	      -DCMAKE_C_FLAGS="$BUILDOPTIONS" \
+	      ..
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }

 postmk() {
-	ClearHostSysNameing $TMPROOT
+	#ClearHostSysNameing $TMPROOT
+	echo "Nothing to do for postmk"
 }
--- a/SysBuild/network/libtirpc
+++ b/SysBuild/network/libtirpc
@ -0,0 +1,99 @@
+#!/bin/bash
+#Framework, welches ein komplettes Linux System aus den Sourcen erstellt
+#dieses Framework wird im CVS Repository
+#:pserver:cvs.compuextreme.de:/Data/cvs zur Verfügung gestellt
+#
+#Lage dieser Datei im Archiv: $HeadURL$
+#
+#(c) 2003 Harald Kueller, Germany
+#This program is free software; you can redistribute it and/or
+#modify ist under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version
+#2 of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#See the GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not write to the Free Software Foundation,
+#Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#Dies ist ein Module zur Verwendung mit genpkg. Die Erzeugung eines
+#Viitor Linux Packetes wird über die Funktionen premk, mk und postmk
+#gesteuert. premk() dient zur Vorbereitung des Sourcecodes. Hier können
+#diverse Änderungen am sourcecode (mit awk/sed usw.) vorgenommen werden
+#mk() umfasst die source Konfiguration und das Übersetzten des source
+#codes. Auch die Installation muß von mk erledigt werden. Hier gild dass
+#die Installation immer nach $TMPROOT erfolgen soll (meisst kann das mit
+#"make DESTDIR=$TMPROOT install" angestossen werden). postmk kann 
+#vor der packeterstellung noch einiges am installationtree ändern. postmk
+#läuft nachdem die Packetabhängigkeiten erstellt wurden.
+#Das Verhalten von genpkg kann über die Variable MKPKG gesteuert werden.
+#Hier müssen FLAGS zur Steuerung gesetzt werden. Folgende Flags werden
+#erkannt:
+#
+#  1	: Package Erzeugung erzwingen. Packet wird, auch wenn es schon
+#	  vorhanden ist, ohne weitere rückfragen neu Erzeugt.
+#  2	: Package Installation erzwingen. Installpkg wird mit -f aufgerufen.
+#	  Das bewirkt, das installpkg keine rückfragen bei der installation
+#	  Stellt, und das packet in jedemfall (neu) installiert.
+#  4	: Sourcepacket nicht nach MAKEDIR entpacken. Ist dieses Flag gesetzt
+#	  muss sich das Module selber um das Entpacken der sourcedateien kümmern.
+#	  vor allem wichtig bei Packeten, für die es keine source.tgz gibt
+#	  (z.B. aus dem CVS generierte Packete).
+#  8	: Erstellung des Packetes aus $TMPROOT wird unterdrückt. Dies ist bei 
+#	  manchen Sonderfällen möglich - wenn sich z.B. der Packetnamen nicht 
+#	  aus dem Namen des sourcearchives ableiten lässt. Packet sollte in
+#	  so einem Fall in der postmk() Funktion erstellt werden.
+# 16	: Packet wird nicht installiert. Bei Packeten wie tar oder bash kann
+#	  die installation mittelst installpkg probleme machen.
+# 32	: Dependics File so erzeugen, das die Abhängigkeiten bei der installation
+#	  erfüllt sein müssen. installpkg bricht in so einem fall bei fehlenden
+#	  packeten die installation ab, und gibt nicht "nur" warnmeldungen aus.
+#	  Wichtig bei packeten mit postinstallroutine, die software aus dem 
+#	  frisch installierten Packet verwendet (wie z.B. postgresql)
+# 64	: sourcetree aufräumen nach packeterstellung unterbinden.
+# 128   : Patches zu den Sourcen nicht einspielen - Module muss sich darum
+#         kümmern
+
+#Module zur Erstellung des Packetes: 
+#Quelle der Source Archive: 
+#Kurzbeschreibung:
+#
+#
+#Letzte Änderung von: $Author$
+#Datum der letzten Änderung: $Date$
+#Version der Datei: $Rev$
+#
+
+SRCPATH=Network/Lib
+
+premk() {
+	echo "Nothing to do for premk()"
+}
+
+mk32() {
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32" \
+	USE_ARCH=32 \
+	./configure --prefix=/usr
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make distclean
+}
+
+mk() {
+	CC="gcc $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS" \
+	USE_ARCH=$UARCH \
+	./configure --libdir=\${prefix}/${LIBDIR} \
+		    --prefix=/usr
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+}
+
+postmk() {
+	echo "Nothing to do for postmk()"
+}
--- a/SysBuild/network/macchanger
+++ b/SysBuild/network/macchanger
@ -79,13 +79,10 @@ premk() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --sysconfdir=/etc
 	make -j $NUMCPU
--- a/SysBuild/network/neon
+++ b/SysBuild/network/neon
@ -94,9 +94,6 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
@ -106,7 +103,7 @@ mk() {
 		    --with-expat \
 		    --with-ssl=openssl \
 		    --sysconfdir=/etc \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/network/net-snmp
+++ b/SysBuild/network/net-snmp
@ -98,12 +98,6 @@ mk32() {
 		    --with-gnu-ld \
 		    --with-perl-modules \
 		    --with-mib-modules="host,smux,tunnel"
-
-	#for i in `find . -name Makefile`; do
-	  #< $i >/tmp/Makefile sed -e "s/prefix.*= /prefix\t= \${DESTDIR}/g"
-	  #mv /tmp/Makefile $i
-	#done
-
 	make -j $NUMCPU
 	make DESTDIR=$TMPROOT install
 	make distclean
@ -111,16 +105,13 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	yes ""|\
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
        	    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --sysconfdir=/etc/snmp \
 		    --with-sys-contact="root@localhost" \
 		    --enable-shared \
@ -128,14 +119,6 @@ mk() {
 		    --with-gnu-ld \
 		    --with-perl-modules \
 		    --with-mib-modules="host,smux,tunnel"
-
-        #for i in `find . -name Makefile`; do
-	  #< $i >/tmp/Makefile sed -e "s/prefix.*= /prefix\t= \${DESTDIR}/g"
-	  #mv /tmp/Makefile $i
-	#done
-
-
-
 	sed -e "s/\/lib /\/lib64 /g" libtool|
 	sed -e "s/\/lib\"/\/lib64\"/g" >/tmp/libtool
 	mv /tmp/libtool libtool
--- a/SysBuild/network/ocfs2-tools
+++ b/SysBuild/network/ocfs2-tools
@ -90,14 +90,13 @@ mk32() {

 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
 		sed -i "s/\(\"-lreadline\)/\1 \/$LIBDIR\/libncursesw.a/" configure
 	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make
 	make DESTDIR=$TMPROOT install
--- a/SysBuild/network/openldap
+++ b/SysBuild/network/openldap
@ -133,7 +133,6 @@ mk32() {
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
        if [ "$MK64BIT" == "true" ]; then
-	  ADDOPTIONS="--libdir=/usr/lib64"
 	  TARGET_LD="elf_x86_64"
 	else
 	  TARGET_LD="elf_i386"
@ -145,7 +144,7 @@ mk() {
 	LDEMULATION=$TARGET_LD \
 	../openldap*/configure --host=$TARGET \
 	                       --prefix=/usr \
-			       $ADDOPTIONS \
+			       --libdir=/usr/${LIBDIR} \
 		               --sysconfdir=/etc \
 		               --libexecdir=/usr/sbin \
 			       --localstatedir=/var \
--- a/SysBuild/network/openslp
+++ b/SysBuild/network/openslp
@ -94,15 +94,12 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
        	    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --enable-async-api \
 		    --enable-slpv2-security 
 	make -j $NUMCPU 
--- a/SysBuild/network/pam_smb
+++ b/SysBuild/network/pam_smb
@ -73,8 +73,7 @@ SRCPATH=Network/Clients

 premk() {
 	for CHANGEFILE in `egrep -l "\/etc\/pam_smb.conf" *`; do 
-	  mv $CHANGEFILE $CHANGEFILE.orig
-	  sed -e "s/\/etc\/pam_smb.conf/\/etc\/security\/pam_smb.conf/g" $CHANGEFILE.orig >$CHANGEFILE
+	  sed -i "s/\/etc\/pam_smb.conf/\/etc\/security\/pam_smb.conf/g" $CHANGEFILE
 	done
 }

@ -83,7 +82,8 @@ mk() {
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
 	            --sysconfdir=/etc/security \
-		    --prefix=/usr
+		    --prefix=/usr \
+		    --libdir=/usr/${LIBDIR}
 	make -j $NUMCPU

 	mkdir -p $TMPROOT/lib/security
@ -91,6 +91,9 @@ mk() {

 	mkdir -p $TMPROOT/etc/security
 	cp pam_smb.conf.example $TMPROOT/etc/security
+	if [ "${MK64BIT}" == "true" ]; then
+		mv $TMPROOT/lib $TMPROOT/lib64
+	fi
 }

 postmk() {
--- a/SysBuild/network/privoxy
+++ b/SysBuild/network/privoxy
@ -82,14 +82,11 @@ premk() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	yes | ./configure --target=$TARGET \
-		    $ADDOPTIONS \
-		    --sysconfdir=\${prefix}/../etc/sysconfig/privoxy \
+		    --libdir=\${prefix}/${LIBDIR} \
+		    --sysconfdir=\${prefix}/../etc/privoxy \
 		    --with-user=nobody \
 		    --with-group=nogroup \
 		    --prefix=/usr
--- a/SysBuild/network/samba
+++ b/SysBuild/network/samba
@ -77,7 +77,7 @@ SRCPATH=Network/Servers

 premk() {
 	mkdir -p $TMPROOT/etc/samba
-	cd source
+	cd source3
 	WD=`pwd`

 #  LDAP support for PDC service
@ -85,12 +85,6 @@ premk() {

 	mkdir mkntpwd
 	tar xvzf $LFSSOURCE/$SRCPATH/mkntpwd* -C mkntpwd
-#	tar xvzf $LFSSOURCE/$SRCPATH/smbldap-tools-0.9.2*
-# delivered with source
-
-	#cd ../examples/VFS
-	#tar xvjf $LFSSOURCE/$SRCPATH/samba-vscan*
-	#cd ../../source
 	cd $WD
 }

@ -130,9 +124,6 @@ mk32() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
@ -141,7 +132,7 @@ mk() {
 		    --sysconfdir=/etc/samba \
 		    --prefix=/opt/samba \
 		    --mandir=/usr/share/man \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --with-privatedir=/etc/samba \
 	            --with-lockdir=/var/locks \
 		    --with-swatdir=/opt/samba/swat \
@ -175,21 +166,6 @@ mk() {
 		chmod 755 $TMPROOT/opt/samba/bin/$i
 	done
 	cd $WD
-
-	## virusscan support
-	## Deaktiviert, da nicht mehr compilebar
-	#make -j $NUMCPU proto
-	#
-	#cd ../examples/VFS/samba-vscan*
-	#./configure --host=$BUILDSYS \
-	            #--target=$TARGET \
-		    #--build=$BUILDSYS \
-		    #--sysconfdir=/etc/samba \
-		    #--prefix=/opt/samba
-	#
-	#make -j $NUMCPU
-	#make -j $NUMCPU DESTDIR=$TMPROOT install
-	#cd $WD
 }

 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
--- a/SysBuild/network/squid
+++ b/SysBuild/network/squid
@ -84,17 +84,14 @@ premk() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/opt/squid/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
        	    --prefix=/opt/squid \
-		    $ADDOPTIONS \
+		    --libdir=/opt/squid/${LIBDIR} \
 		    --datadir=$TMPROOT/opt/squid/share \
-		    --sysconfdir=/etc/sysconfig/squid \
+		    --sysconfdir=/etc/squid \
 		    --localstatedir=$TMPROOT/var \
 		    --includedir=$TMPROOT/include \
 		    --infodir=$TMPROOT/opt/squid/info \
@ -118,7 +115,7 @@ mk() {
 		    --enable-err-language=German 
 	make  -j $NUMCPU
 	make -j $NUMCPU prefix=$TMPROOT/opt/squid \
-	                sysconfdir=$TMPROOT/etc/sysconfig/squid \
+	                sysconfdir=$TMPROOT/etc/squid \
 		        localstatedir=$TMPROOT/var install
 	CheckError "Make install process failed !" 1
 }
@ -126,7 +123,7 @@ mk() {
 postmk() {
 	#mv /etc/squid $TMPROOT/etc/
 	#CheckError "postmk() failed !" 1
-	cd $TMPROOT/etc/sysconfig/squid
+	cd $TMPROOT/etc/squid
 	sed -e "s%$TMPROOT%%g" squid.conf >squid.conf~
 	mv squid.conf~ squid.conf
 	sed -e "s%$TMPROOT%%g" squid.conf.default >squid.conf.default~
--- a/SysBuild/network/tor
+++ b/SysBuild/network/tor
@ -85,13 +85,10 @@ premk() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --sysconfdir=/etc \
 		    --enable-eventdns \
 		    --prefix=/usr
--- a/SysBuild/network/traceroute
+++ b/SysBuild/network/traceroute
@ -85,9 +85,6 @@ mk() {
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --prefix=/usr \
 		    --mandir=/usr/share/man &&
-	#mv /usr/include/netinet /usr/include/netinet.orig
-	#ln -s `pwd`/linux-include/netinet /usr/include/netinet
-	#cp /usr/include/netinet.orig/in.h /usr/include/netinet/
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install-man
@ -95,6 +92,4 @@ mk() {

 postmk() {
 	echo -n
-	#rm /usr/include/netinet
-	#mv /usr/include/netinet.orig /usr/include/netinet
 }
--- a/SysBuild/network/ypserv
+++ b/SysBuild/network/ypserv
@ -80,16 +80,13 @@ premk() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64 \
-		            --libexecdir=\${prefix}/lib64/yp"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --host=$TARGET \
 		    --sysconfdir=/etc/sysconfig/nis \
 		    --localstatedir=/var/yp \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
+		    --libexecdir=\${prefix}/${LIBDIR}/yp \
 	            --mandir=/usr/share/man && 
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/security/cyrus-sasl
+++ b/SysBuild/security/cyrus-sasl
@ -101,13 +101,6 @@ mk32() {
 	make -j $NUMCPU  &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
 	make distclean
-	GenDynLib32 $TMPROOT/usr/lib/sasl2/libsasldb.a 2.1.23
-	GenDynLib32 $TMPROOT/usr/lib/sasl2/libanonymous.a 2.1.23
-	GenDynLib32 $TMPROOT/usr/lib/sasl2/libgssapiv2.a 2.1.23
-	GenDynLib32 $TMPROOT/usr/lib/sasl2/liblogin.a 2.1.23
-	GenDynLib32 $TMPROOT/usr/lib/sasl2/libotp.a 2.1.23
-	GenDynLib32 $TMPROOT/usr/lib/sasl2/libplain.a 2.1.23
-	GenDynLib32 $TMPROOT/usr/lib/libsasl2.a 2.1.23
 	sed -i -e "s/\(dependency_libs='\)\(.*-ldl\)\(.*$\)/\1-L\/usr\/lib\/sasl2 \2 -lgssapiv2 -lgssapi_krb5\3/" \
 	          $TMPROOT/usr/lib/libsasl2.la
 }
@ -115,8 +108,6 @@ mk32() {
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64 \
-		            --with-plugindir=/usr/lib64/sasl2 "
 		mv $TMPROOT/usr/lib/sasl2{,_32}
 	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
@ -124,7 +115,8 @@ mk() {
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
            	    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
+		    --with-plugindir=/usr/${LIBDIR}/sasl2 \
 		    --with-configdir=/etc/sasl2 \
 		    --with-saslauthd=/var/run/sasl2 \
 		    --with-pam=/$LIBDIR/security \
@ -142,13 +134,6 @@ mk() {
 		mv $TMPROOT/usr/lib/sasl2 $TMPROOT/usr/lib64
 		mv $TMPROOT/usr/lib/sasl2_32 $TMPROOT/usr/lib/sasl2
 	fi
-	GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/libsasldb.a 2.1.23
-	GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/libanonymous.a 2.1.23
-	GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/libgssapiv2.a 2.1.23
-	GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/liblogin.a 2.1.23
-	GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/libotp.a 2.1.23
-	GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/libplain.a 2.1.23
-	GenDynLib $TMPROOT/usr/$LIBDIR/libsasl2.a 2.1.23
 	sed -i -e "s/\(dependency_libs='\)\(.*-ldl\)\(.*$\)/\1-L\/usr\/$LIBDIR\/sasl2 \2 -lgssapiv2 -lgssapi_krb5\3/" \
 	          $TMPROOT/usr/$LIBDIR/libsasl2.la
 }
--- a/SysBuild/security/krb5
+++ b/SysBuild/security/krb5
@ -78,7 +78,7 @@ SRCPATH=Security/System
 #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen

 premk() {
-	X11R7_Fix
+	#X11R7_Fix
 	cd src
 }

@ -103,15 +103,12 @@ mk32() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
-	LDFLAGS="-lm -L/usr/X11R7/lib64" \
+	LDFLAGS="-lm -L/usr/X11R7/${LIBDIR}" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 	            --prefix=/usr \
 		    --sysconfdir=/etc/sysconfig/kerberos \
 		    --localstatedir=/var \
--- a/SysBuild/security/pwgen
+++ b/SysBuild/security/pwgen
@ -78,13 +78,10 @@ premk() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/tools/CDspindown
+++ b/SysBuild/tools/CDspindown
@ -84,8 +84,9 @@ premk() {
 mk() {
 	# Make-Optionen eintragen
 	echo "	gcc -o CDspindown CDspindown.c /usr/$LIBDIR/libc.a" >>Makefile
-	make CC="gcc $BUILDOPTIONS" \
-	     CXX="gcc $BUILDOPTIONS"  &&
+	make CC="gcc $BUILDOPTIONS -fPIE" \
+	     CXX="gcc $BUILDOPTIONS -fPIE"  \ 
+	     LDFLAGS="-pie"
 	make BINDIR=$TMPROOT/usr/sbin install
 	CheckError "Make install process failed !" 1
 }
--- a/SysBuild/tools/OpenSP
+++ b/SysBuild/tools/OpenSP
@ -102,15 +102,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-#		COPTS="-m32"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
        	    --prefix=/usr \
 		    --disable-static \
 		    --disable-doc-build \
@ -125,8 +121,4 @@ mk() {

 postmk() {
 	echo "Nothing to do for postmk()"
-	#cd $TMPROOT/usr/X11R6/bin
-	#ln -s openjade jade
-	#PATH=$STOREPATH
-	#export PATH
 }
--- a/SysBuild/tools/a2ps
+++ b/SysBuild/tools/a2ps
@ -93,14 +93,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --sysconfdir=/etc/sysconfig/a2ps &&
 	make -j $NUMCPU &&
--- a/SysBuild/tools/autofs
+++ b/SysBuild/tools/autofs
@ -83,7 +83,6 @@ premk() {
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
 		mkdir -p $TMPROOT/usr/$LIBDIR/autofs
 	fi
 	CC="gcc $BUILDOPTIONS" \
@ -91,7 +90,7 @@ mk() {
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
 		    --sysconfdir=/etc/sysconfig \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --mandir=/usr/share/man &&
 	sed -i "s/\(\$(RPCGEN)\)/\1 -Y \/usr\/bin/" lib/Makefile
 	make &&
--- a/SysBuild/tools/cups
+++ b/SysBuild/tools/cups
@ -103,17 +103,12 @@ mk32() {

 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	else
-		ADDOPTIONS="--libdir=\${prefix}/lib"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
 		    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --sysconfdir=/etc \
 	            --sharedstatedir=/var/com \
 		    --localstatedir=/var \
--- a/SysBuild/tools/dbus-glib
+++ b/SysBuild/tools/dbus-glib
@ -90,14 +90,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr/ \
 		    --libexecdir=/usr/$LIBDIR/dbus-glib
 	make -j $NUMCPU
--- a/SysBuild/tools/dbus-python
+++ b/SysBuild/tools/dbus-python
@ -90,14 +90,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr/ \
 		    --libexecdir=/usr/$LIBDIR/dbus-glib
 	make USE_ARCH=$UARCH -j $NUMCPU
--- a/SysBuild/tools/doctools
+++ b/SysBuild/tools/doctools
@ -81,14 +81,12 @@ premk() {
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		make -k -j $NUMCPU \
-	           	USE_ARCH=$UARCH \
+		make -k USE_ARCH=$UARCH \
 		   	PREFIX=/usr \
-	           	CXXFLAGS="$BUILDOPTIONS32 -std=gnu++98" \
+	           	CXXFLAGS="$BUILDOPTIONS32 -std=gnu++98 -fabi-version=1" \
 		   	PERL=/usr/bin/perl 
 	else
-		make -k -j $NUMCPU \
-	           	USE_ARCH=$UARCH \
+		make -k USE_ARCH=$UARCH \
 		   	PREFIX=/usr \
 		   	PERL=/usr/bin/perl 
 	fi
--- a/SysBuild/tools/eggdbus
+++ b/SysBuild/tools/eggdbus
@ -83,23 +83,20 @@ mk32() {
 	USE_ARCH=32 \
 	./configure --prefix=/usr \
 		    --disable-man-pages
-	make USE_ARCH=32 LDEMULATION=elf32_i386 -j $NUMCPU -k
-	make USE_ARCH=32 LDEMULATION=elf32_i386 -j $NUMCPU -k DESTDIR=$TMPROOT install
+	make USE_ARCH=32 LDEMULATION=elf32_i386 
+	make USE_ARCH=32 LDEMULATION=elf32_i386 -k DESTDIR=$TMPROOT install
 	make distclean
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --disable-man-pages
-	make -j $NUMCPU -k
-	make -j $NUMCPU -k DESTDIR=$TMPROOT install
+	make -k
+	make -k DESTDIR=$TMPROOT install
 }

 postmk() {
--- a/SysBuild/tools/gpm
+++ b/SysBuild/tools/gpm
@ -77,7 +77,6 @@ premk() {
 		  $TMPROOT/usr/sbin \
 		  $TMPROOT/usr/include \
 		  $TMPROOT/etc/sysconfig/gpm
-	#Fix_Input_h 1
 }

 mk32() {
@ -99,7 +98,6 @@ mk32() {

 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
 		mkdir -p $TMPROOT/usr/lib64
 	fi
 	CC="gcc $BUILDOPTIONS -fPIC" \
@ -107,7 +105,7 @@ mk() {
 	USE_ARCH=$UARCH  \
 	./configure --host=$BUILDSYS \
 		    --prefix=/usr \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --sysconfdir=/etc/sysconfig/gpm 
 	sed -e "s/--no-split//" Makefile.include >/tmp/Makefile.include
 	mv /tmp/Makefile.include .
--- a/SysBuild/tools/gsl
+++ b/SysBuild/tools/gsl
@ -88,14 +88,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/tools/libcap
+++ b/SysBuild/tools/libcap
@ -78,8 +78,9 @@ premk() {
 mk32() {
 	sed -i -e "s/\(CFLAGS.*:=\).*$/\1 \$(BUILDOPTIONS32)/" \
 	       -e "s/\(LDFLAGS.*:=\).*$/\1 \$(BUILDOPTIONS32)/" Make.Rules
-	make -j $NUMPCU lib=lib
-	make -j $NUMCPU DESTDIR=$TMPROOT lib=lib install
+	make -j $NUMCPU lib=lib
+	make  install
+	make  DESTDIR=$TMPROOT lib=lib install
 	make distclean
 }

@ -87,10 +88,10 @@ mk() {
 	sed -i -e "s/\(CFLAGS.*:=\).*$/\1 \$(BUILDOPTIONS)/" \
 	       -e "s/\(LDFLAGS.*:=\).*$/\1 \$(BUILDOPTIONS)/" Make.Rules
 	make -j $NUMCPU
-	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make install
+	make DESTDIR=$TMPROOT install
 }

 postmk() {
-##	rm -r $TMPROOT/usr/include/sys
 	cp libcap/libcap.h $TMPROOT/usr/include
 }
--- a/SysBuild/tools/libsmbios
+++ b/SysBuild/tools/libsmbios
@ -90,14 +90,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/tools/linuxdoc-tools
+++ b/SysBuild/tools/linuxdoc-tools
@ -76,31 +76,13 @@ premk() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${exec_prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${exec_prefix}/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
-
-        echo $TMPROOT | sed -e "s/\//\\\\\//g" >/tmp/tmproot.$$
-	export MKTMPROOT=`cat /tmp/tmproot.$$`
-
-        mv Makefile Makefile.orig
-        < Makefile.orig >Makefile sed -e "s/^prefix.*/prefix = $MKTMPROOT\/usr/g"
-	mv entity-map/Makefile entity-map/Makefile.orig
-	< entity-map/Makefile.orig >entity-map/Makefile sed -e "s/^prefix.*/prefix = $MKTMPROOT\/usr/g"
-
-	mv iso-entities/Makefile iso-entities/Makefile.orig
-	< iso-entities/Makefile.orig >iso-entities/Makefile sed -e "s/^prefix.*/prefix = $MKTMPROOT\/usr/g"
-
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-
-	rm /tmp/tmproot.$$
-
 }

 postmk() {
--- a/SysBuild/tools/mISDNuser
+++ b/SysBuild/tools/mISDNuser
@ -3,7 +3,7 @@
 #dieses Framework wird im CVS Repository
 #:pserver:cvs.compuextreme.de:/Data/cvs zur Verfügung gestellt
 #
-#Lage dieser Datei im Archiv: $HeadURL: svn://svn.compuextreme.de/Viitor/V963/ViitorMake/SysBuild/tools/mISDNuser $
+#Lage dieser Datei im Archiv: $HeadURL$
 #
 #(c) 2003 Harald Kueller, Germany
 #This program is free software; you can redistribute it and/or
@ -64,20 +64,34 @@
 #
 #
 #Letzte Änderung von: $Author$
-#Datum der letzten Änderung: $Date: 2008-05-02 15:13:24 +0200 (Fr, 02 Mai 2008) $
+#Datum der letzten Änderung: $Date$
 #Version der Datei: $Rev$
 #
-#

 SRCPATH=Tools/System

 premk() {
-	mv Makefile Makefile.orig
-	< Makefile.orig >Makefile sed -e "s/INSTALL_PREFIX := \//INSTALL_PREFIX := \$(DESTDIR)\//g;s/MISDNDIR :=.*/MISDNDIR := \/usr/g" 
+	echo "Nothing to do for premk()"
+}
+
+mk32() {
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32" \
+	USE_ARCH=32 \
+	./configure --prefix=/usr
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make distclean
 }

 mk() {
-	make DESTDIR=$TMPROOT install
+	CC="gcc $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS" \
+	USE_ARCH=$UARCH \
+	./configure --libdir=/usr/${LIBDIR} \
+		    --prefix=/usr
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }

 postmk() {
--- a/SysBuild/tools/popt
+++ b/SysBuild/tools/popt
@ -93,14 +93,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
        	    --prefix=/usr &&
 	make -j $NUMCPU  &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/tools/recode
+++ b/SysBuild/tools/recode
@ -86,14 +86,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --host=$TARGET \
-	            $ADDOPTIONS \
+	            --libdir=/usr/${LIBDIR} \
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
--- a/SysBuild/tools/sgml-common
+++ b/SysBuild/tools/sgml-common
@ -78,13 +78,10 @@ premk() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --prefix=/usr \
 		    --sysconfdir=/etc
 	make -j $NUMCPU
--- a/SysBuild/tools/tidy
+++ b/SysBuild/tools/tidy
@ -85,10 +85,7 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		mv Makefile{,.orig}
-		sed -e "s/\/lib/\/lib64/" Makefile.orig >Makefile
-	fi
+	sed -i "s/\/lib/\/${LIBDIR}/" Makefile
 	make -j $NUMCPU CC="gcc $BUILDOPTIONS -fPIC"
 	make -j $NUMCPU CC="gcc $BUILDOPTIONS -fPIC" DESTDIR=$TMPROOT install
 	GenDynLib $TMPROOT/usr/$LIBDIR/libtidy.a 1.0.0
--- a/SysBuild/tools/zsh
+++ b/SysBuild/tools/zsh
@ -90,17 +90,11 @@ mk() {
        	    --prefix=/usr \
 	            --bindir=/bin \
 		    --with-curses-terminfo 
-	CheckError "Configurescript failed !" 1
-	
-	# Make-Optionen eintragen
 	make
-	CheckError "Makeprocess failed  !" 1
-	
-	# Make install Optionen eintragen
 	make DESTDIR=$TMPROOT install
-	CheckError "Make install process failed !" 1
 }

 postmk() {
-	mv $TMPROOT/usr/man $TMPROOT/usr/share
+	#mv $TMPROOT/usr/man $TMPROOT/usr/share
+	echo "Nothing to do for zsh"
 }