Weitere Viele Module fertiggestellt.

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4777 504e572c-2e33-0410-9681-be2bf7408885

SysBuild/BuildCluster/Tools.dmk

@@ -1,18 +1,31 @@
-0	tools/mono
+0	development/mono
-0	tools/tin
+0	network/tin
 0	tools/mc
 0	tools/PolicyKit
 0	tools/ConsoleKit
 0	tools/hal
+0	network/tcpdump
+0	network/vtun
+0	network/irssi
+0	development/ExtUtils-F77
+0	development/XML-Simple
+0	development/XML-SAX-Base
+0	development/URI
+0	development/Convert-ASN1
+0	development/Digest-HMAC
+0	development/Authen-SASL
+0	development/IO-Socket-SSL
+0	development/NET_SSLeay.pm
+0	development/Net-DBus
+0	development/Crypt-SmbHash
+0	development/GnuPG
+#Configuriert Interactive - not good!
+#0	development/perl-ldap
+0	network/yafc
+0	network/quagga
+0	network/aria2
+0	network/ircii
 
-0	tools/tcpdump
-0	tools/vtun
-0	tools/nagios-plugins
-0	tools/irssi
-0	tools/yafc
-0	tools/quagga
-0	tools/aria2
-0	tools/ircii
 0	tools/rpm
 0	tools/clamcour
 0	tools/rsync
@@ -44,8 +57,6 @@
 0	tools/cvs
 0	tools/ruby
 0	tools/ruby-utils
-0	tools/NET_SSLeay.pm
-0	tools/Net-DBus
 0	tools/bluez-utils
 0	tools/dump
 0	tools/lha
@@ -70,3 +81,4 @@
 #0	tools/pidgin-otr
 #Benötigt PostgreSQL
 #0	tools/dspam
+#0	tools/nagios-plugins

SysBuild/development/Authen-SASL

@@ -69,15 +69,14 @@
 #
 #
 
-SRCPATH=Tools/Development
+SRCPATH=/Development/Modules
-
-
 
 premk() {
 	echo "Nothing to do for premk()"
 }
 
-mk() {
+mk32() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=$TMPROOT/usr
 	make -j $NUMCPU
@@ -87,6 +86,21 @@ mk() {
 	mkdir -p $INSTLIB
 	touch $INSTLIB/perllocal.pod
 
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+}
+
+mk() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'`
+	mkdir -p $INSTLIB
+	touch $INSTLIB/perllocal.pod
 
 	# Make install Optionen eintragen
 	make -j $NUMCPU install

SysBuild/development/Convert-ASN1

@@ -69,15 +69,14 @@
 #
 #
 
-SRCPATH=Tools/Development
+SRCPATH=Development/Modules
-
-
 
 premk() {
 	echo "Nothing to do for premk()"
 }
 
-mk() {
+mk32() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=$TMPROOT/usr
 	make -j $NUMCPU
@@ -87,6 +86,21 @@ mk() {
 	mkdir -p $INSTLIB
 	touch $INSTLIB/perllocal.pod
 
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+}
+
+mk() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'`
+	mkdir -p $INSTLIB
+	touch $INSTLIB/perllocal.pod
 
 	# Make install Optionen eintragen
 	make -j $NUMCPU install
@@ -94,8 +108,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()"
 }

SysBuild/development/Crypt-SmbHash

@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/Development
+SRCPATH=Development/Modules
 
 
 
@@ -77,7 +77,8 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
-mk() {
+mk32() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=$TMPROOT/usr
 	make -j $NUMCPU
@@ -87,6 +88,21 @@ mk() {
 	mkdir -p $INSTLIB
 	touch $INSTLIB/perllocal.pod
 
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+}
+
+mk() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'`
+	mkdir -p $INSTLIB
+	touch $INSTLIB/perllocal.pod
 
 	# Make install Optionen eintragen
 	make -j $NUMCPU install

SysBuild/development/Digest-HMAC

@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/Development
+SRCPATH=Development/Modules
 
 
 
@@ -77,7 +77,8 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
-mk() {
+mk32() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=$TMPROOT/usr
 	make -j $NUMCPU
@@ -87,6 +88,21 @@ mk() {
 	mkdir -p $INSTLIB
 	touch $INSTLIB/perllocal.pod
 
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+}
+
+mk() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'`
+	mkdir -p $INSTLIB
+	touch $INSTLIB/perllocal.pod
 
 	# Make install Optionen eintragen
 	make -j $NUMCPU install

SysBuild/development/Digest-MD5

@@ -79,6 +79,20 @@ premk() {
 	CheckError "premk() failed !" 1
 }
 
+mk32() {
+	# Make-Optionen eintragen
+	export USE_ARCH=32
+	perl Makefile.PL prefix=/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+	
+	# Make install Optionen eintragen
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	CheckError "Make install process failed !" 1
+	unset USE_ARCH
+	make distclean
+}
+
 mk() {
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=/usr

SysBuild/development/Digest-SHA1

@@ -77,6 +77,24 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
+mk32() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'`
+	mkdir -p $INSTLIB
+	touch $INSTLIB/perllocal.pod
+
+
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+	unset USE_ARCH
+}
+
 mk() {
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=$TMPROOT/usr

SysBuild/development/ExtUtils-F77

@@ -68,22 +68,32 @@
 #
 
 #Pfad zum Basis-Sourcetree :
-SRCPATH=Tools/Development
+SRCPATH=/Development/Modules
 
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
 #SRCDIR=<PFAD>
 
 
 premk() { 
-	PERLVERSION=`perl --version|grep  " v"|sed -e "s/.*v//"|awk '{print $1}'`
+	echo "Nothing to do for premk()"
-        mkdir -p $TMPROOT/usr/lib/site_perl/$PERLVERSION/Alien/Package
+}
-	return 0
+
+mk32() {
+	export USE_ARCH=$UARCH
+	perl Makefile.PL PREFIX=$TMPROOT/usr
+	CheckError "Configurescript failed !" 1
+	
+	# Make-Optionen eintragen
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+	
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
 }
 
 mk() {
-	# Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen.
+	export USE_ARCH=$UARCH
-	# Den \ nicht vergessen !
-	#perl Makefile.PL PREFIX=$TMPROOT
 	perl Makefile.PL PREFIX=$TMPROOT/usr
 	CheckError "Configurescript failed !" 1
 	

SysBuild/development/GnuPG

@@ -68,7 +68,7 @@
 #
 
 #Pfad zum Basis-Sourcetree :
-SRCPATH=Tools/Development
+SRCPATH=Development/Modules
 
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
 #SRCDIR=<PFAD>
@@ -78,7 +78,16 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
+mk32() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL PREFIX=$TMPROOT/usr &&
+	make -j $NUMCPU &&
+	make -j $NUMCPU PREFIX=$TMPROOT/usr install
+}
+
 mk() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL PREFIX=$TMPROOT/usr &&
 	make -j $NUMCPU &&

SysBuild/development/IO-Socket-SSL

@@ -69,7 +69,7 @@
 #
 #
  
-SRCPATH=Tools/Development
+SRCPATH=Development/Modules
 
 
 
@@ -77,7 +77,8 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
-mk() {
+mk32() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=$TMPROOT/usr
 	make -j $NUMCPU
@@ -87,6 +88,21 @@ mk() {
 	mkdir -p $INSTLIB
 	touch $INSTLIB/perllocal.pod
 
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+}
+
+mk() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'`
+	mkdir -p $INSTLIB
+	touch $INSTLIB/perllocal.pod
 
 	# Make install Optionen eintragen
 	make -j $NUMCPU install
@@ -94,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()"
 }

SysBuild/development/Net-DBus

@@ -68,7 +68,7 @@
 #
 
 #Pfad zum Basis-Sourcetree :
-SRCPATH=Tools/Development
+SRCPATH=Development/Modules
 
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
 #SRCDIR=<PFAD>
@@ -79,7 +79,20 @@ premk() {
 	CheckError "premk() failed !" 1
 }
 
+mk32() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+	
+	# Make install Optionen eintragen
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	CheckError "Make install process failed !" 1
+}
+
 mk() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=/usr
 	make -j $NUMCPU

SysBuild/development/Net-SSLeay

@@ -69,7 +69,7 @@
 #
 #
  
-SRCPATH=Tools/Development
+SRCPATH=Development/Modules
 
 
 
@@ -77,9 +77,10 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
-mk() {
+mk32() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
-	perl Makefile.PL /usr -- PREFIX=$TMPROOT/usr
+	yes ""|perl Makefile.PL /usr -- PREFIX=$TMPROOT/usr
 	make -j $NUMCPU
 	CheckError "Makeprocess failed  !" 1
 
@@ -87,6 +88,21 @@ mk() {
 	mkdir -p $INSTLIB
 	touch $INSTLIB/perllocal.pod
 
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+}
+
+mk() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	yes ""|perl Makefile.PL /usr -- PREFIX=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'`
+	mkdir -p $INSTLIB
+	touch $INSTLIB/perllocal.pod
 
 	# Make install Optionen eintragen
 	make -j $NUMCPU install
@@ -94,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()"
 }

SysBuild/development/Sys-Syslog

@@ -75,6 +75,20 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
+mk32() {
+	export USE_ARCH=$UARCH
+        # Make-Optionen eintragen
+	echo -n "\n\n\n\n\n\n\n" | perl Makefile.PL prefix=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+	make distclean
+	unset USE_ARCH
+}
+
 mk() {
         # Make-Optionen eintragen
 	echo -n "\n\n\n\n\n\n\n" | perl Makefile.PL prefix=$TMPROOT/usr

SysBuild/development/URI

@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/Development
+SRCPATH=/Development/Modules
 
 
 
@@ -77,7 +77,8 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
-mk() {
+mk32() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=$TMPROOT/usr
 	make -j $NUMCPU
@@ -87,6 +88,21 @@ mk() {
 	mkdir -p $INSTLIB
 	touch $INSTLIB/perllocal.pod
 
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+}
+
+mk() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'`
+	mkdir -p $INSTLIB
+	touch $INSTLIB/perllocal.pod
 
 	# Make install Optionen eintragen
 	make -j $NUMCPU install

SysBuild/development/XML-SAX-Base

@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/Development
+SRCPATH=/Development/Modules
 
 
 
@@ -77,7 +77,25 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
+mk32() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'`
+	mkdir -p $INSTLIB
+	touch $INSTLIB/perllocal.pod
+
+
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+}
+
 mk() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=$TMPROOT/usr
 	make -j $NUMCPU

SysBuild/development/XML-Simple

@@ -65,7 +65,7 @@
 #
 
 #Pfad zum Basis-Sourcetree :
-SRCPATH=Tools/Development
+SRCPATH=/Development/Modules
 
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
 #SRCDIR=<PFAD>
@@ -75,7 +75,20 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
+mk32() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+	
+	# Make install Optionen eintragen
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	CheckError "Make install process failed !" 1
+}
+
 mk() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=/usr
 	make -j $NUMCPU

SysBuild/development/perl-ldap

@@ -69,7 +69,7 @@
 #
 #
  
-SRCPATH=Tools/Development
+SRCPATH=Development/Modules
 
 
 
@@ -77,7 +77,8 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
-mk() {
+mk32() {
+	export USE_ARCH=$UARCH
 	# Make-Optionen eintragen
 	perl Makefile.PL prefix=$TMPROOT/usr
 	make -j $NUMCPU
@@ -87,6 +88,21 @@ mk() {
 	mkdir -p $INSTLIB
 	touch $INSTLIB/perllocal.pod
 
+	# Make install Optionen eintragen
+	make -j $NUMCPU install
+	CheckError "Make install process failed !" 1
+}
+
+mk() {
+	export USE_ARCH=$UARCH
+	# Make-Optionen eintragen
+	perl Makefile.PL prefix=$TMPROOT/usr
+	make -j $NUMCPU
+	CheckError "Makeprocess failed  !" 1
+
+	INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'`
+	mkdir -p $INSTLIB
+	touch $INSTLIB/perllocal.pod
 
 	# Make install Optionen eintragen
 	make -j $NUMCPU install

SysBuild/network/aria2c

@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Network/Clients
 
 premk() {
 	echo "Nothing to do for premk()"
@@ -78,8 +78,7 @@ premk() {
 mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
-	./configure --target=$TARGET \
+	./configure --sysconfdir=/etc \
-	            --sysconfdir=/etc \
 		    --docdir=/usr/share/doc/atria2 \
 		    --prefix=/usr
 	make -j $NUMCPU

SysBuild/network/htdig

@@ -70,11 +70,11 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Network/Clients
 
 premk() {
-	sed -e "s%^CC =.*$%CC = /opt/gcc-3/bin/gcc%" htsearch/Makefile.in |\
+	sed -e "s%^CC =.*$%CC = gcc%" htsearch/Makefile.in |\
-	sed -e "s%^CXX =.*$%CXX = /opt/gcc-3/bin/g++%" |\
+	sed -e "s%^CXX =.*$%CXX = g++%" |\
 	sed -e "s%^LIBTOOL = @LIBTOOL@%LIBTOOL = @LIBTOOL@ --tag bla%" >/tmp/Makefile.in
 	mv /tmp/Makefile.in htsearch/Makefile.in
 }

SysBuild/network/ircii

@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Network/Clients
 
 premk() {
 	echo "Nothing to do for premk()"
@@ -81,8 +81,7 @@ mk() {
 	./configure --host=$BUILDSYS \
 		    --with-emacs-meta-keys \
 		    --prefix=/usr
-	mv Makefile Makefile.nearly
+	sed -i -e "s/^LIBS = /LIBS = -liconv /g" Makefile
-	sed -e "s/^LIBS = /LIBS = -liconv /g" Makefile.nearly > Makefile 
 	make -j $NUMCPU
 	make -k -j $NUMCPU DESTDIR=$TMPROOT install
 }

SysBuild/network/irssi

@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Network/Clients
 
 premk() {
 	echo "Nothing to do for premk()"
@@ -78,6 +78,8 @@ premk() {
 mk32() {
 	CC="gcc $BUILDOPTIONS32" \
 	CXX="g++ $BUILDOPTIONS32" \
+	USE_ARCH=$UARCH \
+	LDEMULATION=elf_i386 \
 	./configure --target=$TARGET32 \
 		    --with-socks \
 		    --with-textui \
@@ -87,7 +89,7 @@ mk32() {
 		    --with-gc \
 		    --sysconfdir=/etc \
 		    --prefix=/usr
-	make -j $NUMCPU
+	make -j $NUMCPU LDEMULATION=elf_i386
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make distclean
 }
@@ -98,6 +100,7 @@ mk() {
 	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
+	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
 		    --with-socks \
 		    --with-textui \

SysBuild/network/mutt

@@ -60,7 +60,8 @@
 
 #Module zur Erstellung des Packetes: 
 #Quelle der Source Archive: http://www.mutt.org
-#Kurzbeschreibung: Kommandozeilen Mailclient f. Maildir, Mailfile, POP3, IMAP
+#Kurzbeschreibung:
+#Kommandozeilen Mailclient f. Maildir, Mailfile, POP3, IMAP
 #
 #
 #Letzte Änderung von: $Author$
@@ -69,7 +70,7 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Network/Clients
 
 premk() {
 	echo "Nothing to do for premk()"

SysBuild/network/openvpn

@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Network/Servers
 
 premk() {
 	echo "Nothing to do for premk()"

SysBuild/network/pam_ldap

@@ -70,16 +70,27 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Network/Clients
 
 premk() {
 	echo "Nothing to do for premk()"
 }
 
+mk32() {
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32" \
+	./configure --target=$TARGET32 
+		   
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make distclean
+}
+
 mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
-	./configure --target=$TARGET 
+	./configure --target=$TARGET  \
+		    --libdir=/$LIBDIR
 		   
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install

SysBuild/network/quagga

@@ -69,16 +69,17 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Network/Servers
 
 premk() {
 	echo "Nothing to do for premk()"
 }
 
-mk() {
+mk32() {
-	CC="gcc $BUILDOPTIONS" \
+	CC="gcc $BUILDOPTIONS32" \
-	CXX="g++ $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS32" \
-	./configure --target=$TARGET \
+	./configure --target=$TARGET32 \
+		    --libdir=/usr/lib \
                     --enable-vtysh \
 		    --enable-snmp \
 		    --enable-tcp-zebra \
@@ -87,6 +88,28 @@ mk() {
 		    --enable-ospf-te \
 		    --enable-tcp-signature \
 		    --enable-irdp \
+		    --disable-ipv6 \
+		    --sysconfdir=/etc/quagga \
+		    --prefix=/usr
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make distclean
+}
+
+mk() {
+	CC="gcc $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS" \
+	./configure --target=$TARGET \
+		    --libdir=/usr/$LIBDIR \
+                    --enable-vtysh \
+		    --enable-snmp \
+		    --enable-tcp-zebra \
+		    --enable-nssa \
+		    --enable-opaque-lsa \
+		    --enable-ospf-te \
+		    --enable-tcp-signature \
+		    --enable-irdp \
+		    --disable-ipv6 \
 		    --sysconfdir=/etc/quagga \
 		    --prefix=/usr
 	make -j $NUMCPU

SysBuild/network/rsync

@@ -69,7 +69,7 @@
 #
 
 #Pfad zum Basis-Sourcetree :
-SRCPATH=Tools/Net
+SRCPATH=Network/Servers
 
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
 #SRCDIR=<PFAD>

SysBuild/network/sendmail

@@ -73,7 +73,7 @@
 #
 
 #Pfad zu Basis Source Tree eintragen!
-SRCPATH=Tools/Net
+SRCPATH=Network/Servers
 
 #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
 #ausgeführt (sprich unpack src; cd src; premk)

SysBuild/network/tcpdump

@@ -69,7 +69,7 @@
 #
 
 #Pfad zum Basis-Sourcetree :
-SRCPATH=Tools/Net
+SRCPATH=Network/Monitor
 
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
 #SRCDIR=<PFAD>
@@ -83,7 +83,8 @@ mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
-        	    --prefix=/usr &&
+        	    --prefix=/usr \
+		    --disable-ipv6 &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	CheckError "Make install process failed !" 1

SysBuild/network/vtun

@@ -71,7 +71,7 @@
 #
 
 #Pfad zum Basis-Sourcetree :
-SRCPATH=Tools/Net
+SRCPATH=Network/Servers
 
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
 #SRCDIR=<PFAD>
@@ -89,13 +89,9 @@ mk() {
 		    --disable-lzo \
 		    --sysconfdir=/etc/sysconfig/vtun \
 		    --localstatedir=/var \
-		    --mandir=/usr/share/man
+		    --mandir=/usr/share/man &&
-	make -j $NUMCPU
+	make -j $NUMCPU &&
-	make -j $NUMCPU prefix=$TMPROOT/usr \
+	make -j $NUMCPU DESTDIR=$TMPROOT install
-	     ETC_DIR=$TMPROOT/etc/sysconfig/vtun \
-	     VAR_DIR=$TMPROOT/var \
-	     MAN_DIR=$TMPROOT/usr/share/man install
-	CheckError "Make install process failed !" 1
 }
 
 postmk() {

SysBuild/network/yafc

@@ -68,7 +68,7 @@
 #
 
 #Pfad zu Basis Source Tree eintragen!
-SRCPATH=Tools/Net
+SRCPATH=Network/Clients
 
 #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
 #ausgeführt (sprich unpack src; cd src; premk)
@@ -84,8 +84,8 @@ mk() {
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --host=$TARGET \
 		    --prefix=/usr \
-		    --without-krb5 \
+		    --without-gssapi \
-		    --without-gssapi &&
+		    --without-krb5 &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
 }

SysBuild/security/nss

@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/lib
+SRCPATH=Security/Lib
 
 premk() {
 	mkdir -p $TMPROOT/opt/mozilla/nss

SysBuild/tools/nrpe

@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/Net
+SRCPATH=Tools/Utilities
 
 premk() {
 	if ! getent group nagios ; then

SysBuild/tools/rpm

@@ -84,6 +84,7 @@ premk() {
 mk32() {
 	CC="gcc $BUILDOPTIONS32" \
 	CXX="g++ $BUILDOPTIONS32" \
+	USE_ARCH=$UARCH \
 	./configure --target=$TARGET32 \
 		    --prefix=/usr \
 		    --with-gnu-ld \
@@ -100,6 +101,7 @@ mk() {
 	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
+	USE_ARCH=$UARCH \
 	./configure --target=$TARGET \
 		    --prefix=/usr \
 		    $ADDOPTIONS \