From 0d0cf861a42b62200a514ae73fac186f9ca09db1 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Mon, 30 Mar 2009 20:29:52 +0000
Subject: [PATCH] Anpassung an neue Version.

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4571 504e572c-2e33-0410-9681-be2bf7408885
---
 BaseBuild/Basesys/Basesys.dmk       | 56 +++++++++---------
 BaseBuild/Basesys/bzip2             |  9 ++-
 BaseBuild/Basesys/diffutils         |  5 +-
 BaseBuild/Basesys/file              |  7 ++-
 BaseBuild/Basesys/gawk              |  1 -
 BaseBuild/Basesys/gettext           |  8 +--
 BaseBuild/Basesys/grep              |  3 +-
 BaseBuild/Basesys/groff             | 14 +++--
 BaseBuild/Basesys/gzip              | 23 +++-----
 BaseBuild/Basesys/iputils           | 91 +++++++++++++++++++++++++++++
 BaseBuild/Basesys/kbd               |  5 +-
 BaseBuild/Basesys/less              |  3 +-
 BaseBuild/Basesys/make              |  3 +-
 BaseBuild/Basesys/man               |  3 +-
 BaseBuild/Basesys/module-init-tools |  7 ++-
 BaseBuild/Basesys/patch             |  3 +-
 BaseBuild/Basesys/psmisc            |  3 +-
 BaseBuild/Basesys/shadow            | 67 ++++++++++-----------
 BaseBuild/Basesys/sysvinit          |  3 -
 BaseBuild/Basesys/tar               |  5 +-
 BaseBuild/Basesys/texinfo           |  3 +-
 BaseBuild/Basesys/udev              | 70 +++++++---------------
 BaseBuild/Basesys/util-linux-ng     | 14 ++---
 BaseBuild/Basesys/vim               |  4 +-
 BaseBuild/Basesys/zlib              | 15 +++--
 25 files changed, 242 insertions(+), 183 deletions(-)
 create mode 100644 BaseBuild/Basesys/iputils

diff --git a/BaseBuild/Basesys/Basesys.dmk b/BaseBuild/Basesys/Basesys.dmk
index 33dea83..5f2aed0 100644
--- a/BaseBuild/Basesys/Basesys.dmk
+++ b/BaseBuild/Basesys/Basesys.dmk
@@ -42,78 +42,80 @@
 16	Basesys/man-pages-de
 16	Basesys/glibc
 16	Basesys/adjust
+16	Basesys/gmp
+16	Basesys/mpfr
+16	Basesys/zlib
 16	Basesys/binutils
-16	Basesys/m4
-16	Basesys/bison
-16	Basesys/zip
-16	Basesys/unzip
 16	Basesys/gcc
+16	Basesys/multiarch_wrapper
 16	Basesys/sed
 16	Basesys/e2fsprogs
 16	Basesys/coreutils
-16	Basesys/multiarch_wrapper
+16	Basesys/m4
+16	Basesys/bison
 16	Basesys/ncurses
 16	Basesys/procps
-16	Basesys/procinfo
 16	Basesys/libtool
 16	Basesys/flex
 16	Basesys/iproute2
 16	Basesys/perl
 16	Basesys/readline
-16	Basesys/gmp
-16	Basesys/zlib
 16	Basesys/autoconf
 16	Basesys/automake
 16	Basesys/bash
 16	Basesys/bzip2
 16	Basesys/diffutils
-16	Basesys/ed
-16	Basesys/reiserfsprogs
-16	Basesys/jfsutils
 16	Basesys/file
 16	Basesys/findutils
 16	Basesys/gawk
 16	Basesys/gettext
-16	Basesys/texinfo
 16	Basesys/grep
 16	Basesys/groff
 16	Basesys/gzip
-16	Basesys/vim
-16	Basesys/zlib
-16	Basesys/subversion
-16	Basesys/vim
-16	Basesys/ViitorMan
 16	Basesys/Linux-PAM
-16	Basesys/inetutils
+16	Basesys/cracklib
+16	Basesys/iputils
 16	Basesys/net-tools
-16	Basesys/portmap
-16	Basesys/xinetd
 16	Basesys/kbd
-16	Basesys/device-mapper
-16	Basesys/LVM
 16	Basesys/less
 16	Basesys/make
 16	Basesys/man
-16	Basesys/mktemp
 16	Basesys/module-init-tools
 16	Basesys/patch
 16	Basesys/psmisc
-16	Basesys/cracklib
 16	Basesys/shadow
+16	Basesys/vim
+16	Basesys/subversion
+16	Basesys/vim
 16	Basesys/sysklogd
 16	Basesys/sysvinit
 16	Basesys/tar
+16	Basesys/texinfo
 16	Basesys/udev
 16	Basesys/util-linux-ng
+16	Basesys/ViitorMan
+16	Basesys/xz
+16	Basesys/yasm
+16	Basesys/bin86
+16	Basesys/lilo
+16	Basesys/zip
+16	Basesys/unzip
+16	Basesys/procinfo
+16	Basesys/ed
+16	Basesys/reiserfsprogs
+16	Basesys/jfsutils
+16	Basesys/inetutils
+16	Basesys/portmap
+16	Basesys/xinetd
+16	Basesys/device-mapper
+16	Basesys/LVM
+16	Basesys/mktemp
 16	Basesys/xfsprogs
 16	Basesys/attr
 16	Basesys/acl
 16	Basesys/fcron
 16	Basesys/hotplug
 16	Basesys/firmwarehotplug
-16	Basesys/yasm
-16	Basesys/bin86
-16	Basesys/lilo
 16	Basesys/fbset
 16	Basesys/which
 16	Basesys/tcsh
diff --git a/BaseBuild/Basesys/bzip2 b/BaseBuild/Basesys/bzip2
index a30eaf6..ccdca74 100644
--- a/BaseBuild/Basesys/bzip2
+++ b/BaseBuild/Basesys/bzip2
@@ -72,14 +72,17 @@ SRCPATH=Base/Utilities
 premk() {
 	mkdir -p $TMPROOT/usr/share/man
 	ln -s $TMPROOT/usr/share/man $TMPROOT/usr/man
+	sed -i -e 's:ln -s -f $(PREFIX)/bin/:ln -s :' Makefile
 }
 
 mk32() {
-	make -f Makefile-libbz2_so \
+	make -j $NUMCPU -f Makefile-libbz2_so \
 	     CC="gcc ${BUILDOPTIONS32}" \
 	     CXX="g++ ${BUILDOPTIONS32}"
-	make clean
-	make CC="gcc ${BUILDOPTIONS32}" CXX="g++ ${BUILDOPTIONS32}" libbz2.a
+	make -j $NUMCPU clean
+	make -j $NUMCPU CC="gcc ${BUILDOPTIONS32}" \
+	                CXX="g++ ${BUILDOPTIONS32}" \
+			libbz2.a
 	mkdir -p $TMPROOT/usr/lib $TMPROOT/lib
 	cp -v libbz2.a $TMPROOT/usr/lib
 	cp -av libbz2.so* $TMPROOT/lib
diff --git a/BaseBuild/Basesys/diffutils b/BaseBuild/Basesys/diffutils
index 11543ec..1672d93 100644
--- a/BaseBuild/Basesys/diffutils
+++ b/BaseBuild/Basesys/diffutils
@@ -75,8 +75,9 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr
+	./configure --prefix=/usr
+	sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' config.h
+	touch man/*.1
 	make -j $NUMCPU
 	make -j $NUMCPU prefix=$TMPROOT/usr install
 }
diff --git a/BaseBuild/Basesys/file b/BaseBuild/Basesys/file
index 8ef8376..2acd33a 100644
--- a/BaseBuild/Basesys/file
+++ b/BaseBuild/Basesys/file
@@ -68,7 +68,11 @@
 
 SRCPATH=Base/System
 
+(( MKPKG = $MKPKG | 128 ))
+
 premk() {
+	SrcPatch $MAKEDIR/file* $LFSSOURCE/$SRCPATH/file-*-fixes-*.patch*
+	SrcPatch $MAKEDIR/file* $LFSSOURCE/$SRCPATH/file-*-new_compressors-*.patch*
 	mkdir -p $TMPROOT/usr/bin $TMPROOT/usr/share/misc \
 		$TMPROOT/usr/share/man/man1 $TMPROOT/usr/share/man/man4
 	cd $TMPROOT/usr
@@ -95,8 +99,7 @@ mk() {
 		ADDOPTIONS="--libdir=/usr/lib64"
 	fi
 	CC="gcc ${BUILDOPTIONS}" \
-	../file*/configure --host=$TARGET \
-		    --prefix=/usr \
+	../file*/configure --prefix=/usr \
 		    $ADDOPTIONS \
 		    --datadir=/usr/share/misc
 	make -j $NUMCPU
diff --git a/BaseBuild/Basesys/gawk b/BaseBuild/Basesys/gawk
index e9d5205..6324694 100644
--- a/BaseBuild/Basesys/gawk
+++ b/BaseBuild/Basesys/gawk
@@ -84,7 +84,6 @@ mk() {
 	./configure --host=$TARGET \
 		    $ADDOPTIONS \
 		    --prefix=/usr &&
-	echo '#define HAVE_LC_MESSAGES 1' >>config.h &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
diff --git a/BaseBuild/Basesys/gettext b/BaseBuild/Basesys/gettext
index 2bf5958..90085f2 100644
--- a/BaseBuild/Basesys/gettext
+++ b/BaseBuild/Basesys/gettext
@@ -78,8 +78,8 @@ mk32() {
 	CXX="g++ ${BUILDOPTIONS32}" \
 	../gettext*/configure --prefix=/usr
 	make -j $NUMCPU
-	make -j $NUMCPU install
-	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make install
+	make DESTDIR=$TMPROOT install
 	cd ../gettext*
 	rm -r ../build-gettext
 	mkdir ../build-gettext
@@ -94,8 +94,8 @@ mk() {
 		    $ADDOPTIONS \
 		    --prefix=/usr
 	make -j $NUMCPU
-	make -j $NUMCPU install
-	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make install
+	make DESTDIR=$TMPROOT install
 }
 
 postmk() {
diff --git a/BaseBuild/Basesys/grep b/BaseBuild/Basesys/grep
index eac3d1b..2b630a9 100644
--- a/BaseBuild/Basesys/grep
+++ b/BaseBuild/Basesys/grep
@@ -76,8 +76,7 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr \
+	./configure --prefix=/usr \
 		    --bindir=/bin &&
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/BaseBuild/Basesys/groff b/BaseBuild/Basesys/groff
index b421882..87c549e 100644
--- a/BaseBuild/Basesys/groff
+++ b/BaseBuild/Basesys/groff
@@ -77,17 +77,19 @@ mk() {
 	if [ "$MK64BIT" == "true" ]; then
 		ADDOPTIONS="--libdir=/usr/lib64"
 	fi
-	PAGE=A4 CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+	PAGE=A4 \
+	CC="gcc ${BUILDOPTIONS}" \
+	CXX="g++ ${BUILDOPTIONS}" \
+	./configure $ADDOPTIONS \
 		    --prefix=/usr
-	make -k -j $NUMCPU
-	make
+	make -j $NUMCPU
 	make -j $NUMCPU prefix=$TMPROOT/usr install
 }
 
 postmk() {
-	mv $TMPROOT/usr/man $TMPROOT/usr/share
+	if [ -d $TMPROOT/usr/man ]; then
+		mv $TMPROOT/usr/man $TMPROOT/usr/share
+	fi
 	ln -sf soelim $TMPROOT/usr/bin/zsoelim
 	ln -sf eqn $TMPROOT/usr/bin/geqn
 	ln -sf tbl $TMPROOT/usr/bin/gtbl
diff --git a/BaseBuild/Basesys/gzip b/BaseBuild/Basesys/gzip
index 776a786..44baefc 100644
--- a/BaseBuild/Basesys/gzip
+++ b/BaseBuild/Basesys/gzip
@@ -76,25 +76,20 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --build=$TARGET \
-	            --target=$TARGET \
-		    --prefix=/usr
+	./configure --prefix=/usr \
+	            --bindir=/bin
 	make -j $NUMCPU
-	make -j $NUMCPU prefix=$TMPROOT/usr install
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
-	mv $TMPROOT/usr/bin/gzip $TMPROOT/bin
-	rm $TMPROOT/usr/bin/{gunzip,zcat}
 	for i in gzexe zcmp zdiff zforce zgrep zmore znew; do
-		sed -e "s%$TMPROOT%%" $TMPROOT/usr/bin/$i >/tmp/$i
-		mv /tmp/$i $TMPROOT/usr/bin/$i
-		chmod 755 $TMPROOT/usr/bin/$i
+		sed -e "s%$TMPROOT%%" $TMPROOT/bin/$i >/tmp/$i
+		mv /tmp/$i $TMPROOT/bin/$i
+		chmod 755 $TMPROOT/bin/$i
 	done
-	ln -s gzip $TMPROOT/bin/gunzip
-	ln -s gzip $TMPROOT/bin/zcat
 	ln -s gzip $TMPROOT/bin/compress
-	ln -s gunzip $TMPROOT/bin/uncompress
-	mv $TMPROOT/usr/man $TMPROOT/usr/share
+	if [ -d $TMPROOT/usr/man ]; then
+		mv $TMPROOT/usr/man $TMPROOT/usr/share
+	fi
 }
diff --git a/BaseBuild/Basesys/iputils b/BaseBuild/Basesys/iputils
new file mode 100644
index 0000000..ff83b55
--- /dev/null
+++ b/BaseBuild/Basesys/iputils
@@ -0,0 +1,91 @@
+#!/bin/bash
+#Framework, welches ein komplettes Linux System aus den Sourcen erstellt
+#dieses Framework wird im CVS Repository
+#:pserver:cvs.tramp-bbs.de:/opt/cvs zur Verfügung gestellt
+#
+#Lage dieser Datei im Archiv: $HeadURL: svn://www.compuextreme.de/Viitor/V962/ViitorMake/BaseBuild/Basesys/grep $
+#
+#(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.
+#
+#Module zur Erstellung des Packetes: iputils
+#Quelle der Source Archive: http://www.skbuff.net/iputils/
+#Kurzbeschreibung:
+#Einige der Basis Networking tools (ping, arping, clockdiff, rdisc
+#tracepath traceroute
+#
+#Letzte Änderung von: $Author: kueller $
+#Datum der letzten Änderung: $Date: 2008-05-02 13:13:24 +0000 (Fr, 02 Mai 2008) $
+#Version der Datei: $Revision: 4220 $
+#
+
+SRCPATH=Base/Net
+
+premk() {
+	echo "Nothing to do for premk()"
+}
+
+mk() {
+	make -j $NUMCPU CC="gcc ${BUILDOPTIONS}"
+}
+
+postmk() {
+	mkdir -p $TMPROOT/bin 
+	mkdir -p $TMPROOT/usr/bin 
+	mkdir -p $TMPROOT/usr/share/man/man8
+	install -v m755 ping{,6} $TMPROOT/bin
+	install -v m755 arping $TMPROOT/usr/bin
+	install -v m755 clockdiff $TMPROOT/usr/bin
+	install -v m755 rdisc $TMPROOT/usr/bin
+	install -v m755 tracepath $TMPROOT/usr/bin
+	install -v m755 trace{path,route}6 $TMPROOT/usr/bin
+	install -v m755 doc/*.8 $TMPROOT/usr/share/man/man8
+}
diff --git a/BaseBuild/Basesys/kbd b/BaseBuild/Basesys/kbd
index e4b92c0..0a19704 100644
--- a/BaseBuild/Basesys/kbd
+++ b/BaseBuild/Basesys/kbd
@@ -85,7 +85,8 @@ mk() {
 		ADDOPTIONS="--datadir=/lib/kbd"
 	fi
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure $ADDOPTIONS &&
+	./configure $ADDOPTIONS \
+	            --prefix=/usr &&
 	make -j $NUMCPU CC="gcc ${BUILDOPTIONS}"
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
@@ -100,5 +101,5 @@ postmk() {
 	rm $TMPROOT/$LIBDIR/kbd/keymaps/i386/qwerty/defkeymap.map.gz
 	ln -s i386/qwertz/de-latin1.map.gz $TMPROOT/$LIBDIR/kbd/keymaps/defkeymap.map.gz
 	mkdir -p $TMPROOT/bin
-	mv $TMROOT/usr/bin/{kbd_mode,openvt,setfont} $TMPROOT/bin
+	mv $TMROOT/usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont} $TMPROOT/bin
 }
diff --git a/BaseBuild/Basesys/less b/BaseBuild/Basesys/less
index a36f739..717ec34 100644
--- a/BaseBuild/Basesys/less
+++ b/BaseBuild/Basesys/less
@@ -77,8 +77,7 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr \
+	./configure --prefix=/usr \
 		    --bindir=/bin \
 		    --sysconfdir=/etc &&
 	make -j $NUMCPU &&
diff --git a/BaseBuild/Basesys/make b/BaseBuild/Basesys/make
index bfeb7e8..89eba57 100644
--- a/BaseBuild/Basesys/make
+++ b/BaseBuild/Basesys/make
@@ -76,8 +76,7 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr \
+	./configure --prefix=/usr \
 		    --mandir=/usr/share/man
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/BaseBuild/Basesys/man b/BaseBuild/Basesys/man
index 2c5e6c6..5c9d75b 100644
--- a/BaseBuild/Basesys/man
+++ b/BaseBuild/Basesys/man
@@ -73,6 +73,7 @@ premk() {
 	mkdir $TMPROOT/usr $TMPROOT/usr/bin $TMPROOT/usr/sbin
 	sed -i 's@-is@&R@g' configure
 	sed -i 's@MANPATH./usr/man@#@g' src/man.conf.in
+	sed -i 's@MANPATH./usr/local/man@#@g' src/man.conf.in
 }
 
 mk() {
@@ -83,5 +84,5 @@ mk() {
 }
 
 postmk() {
-	echo "Nothing to do for postmk()"
+	sed -i -e "s/\(^NROFF.*-T\)utf8/\1latin1/" $TMPROOT/etc/man.conf
 }
diff --git a/BaseBuild/Basesys/module-init-tools b/BaseBuild/Basesys/module-init-tools
index 1c142b3..c20f89f 100644
--- a/BaseBuild/Basesys/module-init-tools
+++ b/BaseBuild/Basesys/module-init-tools
@@ -77,10 +77,11 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/ \
+	./configure --prefix=/ \
+		    --bindir=/bin \
+		    --sbindir=/sbin \
 		    --enable-zlib
-	make -j $NUMCPU
+	make -j $NUMCPU DOCBOOKTOMAN=""
 	make -j $NUMCPU DESTDIR=$TMPROOT INSTALL=install install
 }
 
diff --git a/BaseBuild/Basesys/patch b/BaseBuild/Basesys/patch
index 173d86d..0e34581 100644
--- a/BaseBuild/Basesys/patch
+++ b/BaseBuild/Basesys/patch
@@ -74,8 +74,7 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr &&
+	./configure --prefix=/usr &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU prefix=$TMPROOT/usr install
 }
diff --git a/BaseBuild/Basesys/psmisc b/BaseBuild/Basesys/psmisc
index 5999cf7..8b3f10b 100644
--- a/BaseBuild/Basesys/psmisc
+++ b/BaseBuild/Basesys/psmisc
@@ -74,8 +74,7 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr \
+	./configure --prefix=/usr \
 		    --exec-prefix=""
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
diff --git a/BaseBuild/Basesys/shadow b/BaseBuild/Basesys/shadow
index bfc61f2..7f7c58d 100644
--- a/BaseBuild/Basesys/shadow
+++ b/BaseBuild/Basesys/shadow
@@ -84,24 +84,32 @@ mk32() {
 		    --enable-shared \
 		    --with-libpam \
 		    --without-audit \
-		    --without-selinux 
+		    --without-selinux \
+		    --with-libcrack 
 	sed -i 's/groups$(EXEEXT) //' src/Makefile
-	sed -e '/groups/d' man/Makefile
+	find man -name Makefile -exec sed -i '/groups.1.xml/d' '{}' \;
+	find man -name Makefile -exec sed -i 's/groups.1 //' '{}' \;
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	if [ ! -d $TMPROOT/lib ]; then
+		mkdir $TMPROOT/lib
+	fi
+	cp lib/.libs/libshadow.a $TMPROOT/lib/
+	cp libmisc/libmisc.a $TMPROOT/lib/
 	cd ../shadow*
 	rm -r ../build-shadow
 	mkdir ../build-shadow
 	cd ../build-shadow
-	cp misc/libmisc.a $TMPROOT/usr/lib
 }
 
 		    
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
 		ADDOPTIONS="--libdir=/lib64"
+		LIBDIR=lib64
 	else
 		ADDOPTIONS="--libdir=/lib"
+		LIBDIR=lib
 	fi
 	CC="gcc ${BUILDOPTIONS}" \
 	CC="gcc ${BUILDOPTIONS}"  \
@@ -112,49 +120,38 @@ mk() {
 		    --enable-shared \
 		    --with-libpam \
 		    --without-audit \
-		    --without-selinux
-         sed -i libtool -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g' \
-	                -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g'
+		    --without-selinux \
+		    --with-libcrack 
 	sed -i 's/groups$(EXEEXT) //' src/Makefile
-	sed -e '/groups/d' man/Makefile
+	find man -name Makefile -exec sed -i '/groups.1.xml/d' '{}' \;
+	find man -name Makefile -exec sed -i 's/groups.1 //' '{}' \;
 	make -j $NUMCPU
 	make -j $NUMCPU install
 	make DESTDIR=$TMPROOT install
-	if [ "$MK64BIT" == "true" ] ; then
-		cp misc/libmisc.a $TMPROOT/usr/lib64
-	else
-		cp misc/libmisc.a $TMPROOT/usr/lib
+	if [ ! -d $TMPROOT/$LIBDIR ]; then
+		mkdir $TMPROOT/$LIBDIR
 	fi
+	if [ ! -d $TMPROOT/usr/$LIBDIR ]; then
+		mkdir $TMPROOT/usr/$LIBDIR
+	fi
+	cp lib/.libs/libshadow.a $TMPROOT/usr/$LIBDIR
+	cp libmisc/libmisc.a $TMPROOT/$LIBDIR
 }
 
 postmk() {
 	mkdir -p $TMPROOT/{etc,bin,var,usr} $TMPROOT/usr/lib $TMPROOT/var/{log,run}
 	cd ../shadow*
 	cp etc/{limits,login.access} $TMPROOT/etc
-	cp $TMPROOT/etc/login.defs{,.store}
-	sed -e "s%/var/spool/mail%/var/mail%" \
-	    -e "s%^FAILLOG_ENAB%#FAILLOG_ENAB%" \
-	    -e "s%^LASTLOG_ENAB%#LASTLOG_ENAB%" \
-	    -e "s%^MAIL_CHECK_ENAB%#MAIL_CHECK_ENAB%" \
-	    -e "s%^OBSCURE_CHECKS_ENAB%#OBSCURE_CHECKS_ENAB%" \
-	    -e "s%^PORTTIME_CHECKS_ENAB%#PORTTIME_CHECKS_ENAB%" \
-	    -e "s%^QUOTAS_ENAB%#QUOTAS_ENAB%" \
-	    -e "s%^MOTD_FILE%#MOTD_FILE%" \
-	    -e "s%^FTMP_FILE%#FTMP_FILE%" \
-	    -e "s%^NOLOGINS_FILE%#NOLOGINS_FILE%" \
-	    -e "s%^ENV_HZ%#ENV_HZ%" \
-	    -e "s%^ENV_SUPATH%#ENV_SUPATH%" \
-	    -e "s%^ENV_PATH%#ENV_PATH%" \
-	    -e "s%^PASS_MIN_LEN%#PASS_MIN_LEN%" \
-	    -e "s%^SU_WHEEL_ONLY%#SU_WHEEL_ONLY%" \
-	    -e "s%^CRACKLIB_DICTPATH%#CRACKLIB_DICTPATH%" \
-	    -e "s%^PASS_CHANGE_TRIES%#PASS_CHANGE_TRIES%" \
-	    -e "s%^PASS_ALWAYS_WARN%#PASS_ALWAYS_WARN%" \
-	    -e "s%^CHFN_AUTH%#CHFN_AUTH%" \
-	    -e "s%^MD5_CRYPT_ENAB%#MD5_CRYPT_ENAB%" \
-	    -e "s%^ENVIRON_FILE%#ENVIRON_FILE%" \
-	    $TMPROOT/etc/login.defs.store >$TMPROOT/etc/login.defs
-	rm $TMPROOT/etc/login.defs.store
+	sed -i -e "s%/var/spool/mail%/var/mail%" \
+	    -e "s%#MD5_CRYPT_ENAB.no%MD5_CRYPT_ENAB yes%" $TMPROOT/etc/login.defs
+        FUNCTIONS="LASTLOG_ENAB MAIL_CHECK_ENAB PORTTIME_CHECKS_ENAB CONSOLE MOTD_FILE
+           NOLOGINS_FILE PASS_MIN_LEN SU_WHEEL_ONLY MD5_CRYPT_ENAB CONSOLE_GROUPS
+           ENVIRON_FILE ULIMIT ENV_TZ ENV_HZ ENV_SUPATH ENV_PATH QMAIL_DIR MAIL_DIR
+           MAIL_FILE CHFN_AUTH FAILLOG_ENAB QUOTAS_ENAB FTMP_FILE OBSCURE_CHECKS_ENAB
+           CRACKLIB_DICTPATH PASS_CHANGE_TRIES PASS_ALWAYS"
+	for function in $FUNCTIONS; do
+     		sed -i "s/^$function/# &/" /etc/login.defs
+	done
 	touch $TMPROOT/var/run/utmp $TMPROOT/var/log/{btmp,lastlog,wtmp}
 	mv -v $TMPROOT/usr/bin/passwd $TMPROOT/bin
 	mv -v $TMPROOT/lib/libshadow.*a $TMPROOT/usr/lib
diff --git a/BaseBuild/Basesys/sysvinit b/BaseBuild/Basesys/sysvinit
index 2702110..54cbf9c 100644
--- a/BaseBuild/Basesys/sysvinit
+++ b/BaseBuild/Basesys/sysvinit
@@ -69,9 +69,6 @@
 SRCPATH=Base/System
 
 premk() {
-	sed -e 's/Sending processes/Sending processes started by init/g' \
-       	init.c >/tmp/init.c~
-	mv /tmp/init.c~  init.c
 	for i in $TMPROOT/sbin \
 	         $TMPROOT/usr \
 		 $TMPROOT/usr/bin \
diff --git a/BaseBuild/Basesys/tar b/BaseBuild/Basesys/tar
index 7c751e1..aa28045 100644
--- a/BaseBuild/Basesys/tar
+++ b/BaseBuild/Basesys/tar
@@ -78,10 +78,9 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr \
+	./configure --prefix=/usr \
 		    --bindir=/bin \
-		    --libexecdir=/usr/bin 
+		    --libexecdir=/usr/sbin 
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
diff --git a/BaseBuild/Basesys/texinfo b/BaseBuild/Basesys/texinfo
index 31d8f67..3e11c51 100644
--- a/BaseBuild/Basesys/texinfo
+++ b/BaseBuild/Basesys/texinfo
@@ -74,8 +74,7 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr
+	./configure --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
diff --git a/BaseBuild/Basesys/udev b/BaseBuild/Basesys/udev
index d3e1ca2..8343744 100644
--- a/BaseBuild/Basesys/udev
+++ b/BaseBuild/Basesys/udev
@@ -72,85 +72,55 @@
 SRCPATH=Base/System
 
 premk() {
-	sed -e "s%/usr/local/bin%/usr/bin%" Makefile >/tmp/Makefile
-	mv /tmp/Makefile .
+	echo "Nothing to do for premk() "
 }
 
 mk32() {
-	cd extras/volume_id/lib
-	make -j $NUMCPU CC="gcc ${BUILDOPTIONS32}" \
-	                AR=ar \
-			RANLIB=ranlib \
-			E=@echo \
-			Q=@ \
-	     		LDFLAGS="-m32" 
+	CC="gcc ${BUILDOPTIONS32}" \
+	CXX="g++ ${BUILDOPTIONS32}" \
+	./configure --prefix=/usr \
+	            --exec-prefix= \
+	            --sysconfdir=/etc \
+	            --with-libdir-name=lib
+	make -j $NUMCPU
 	make DESTDIR=$TMPROOT install
-	cd $MAKEDIR/udev*
 	make clean
 }
 
 mk() {
 	if [ "$MK64BIT" == "true" ];then
-		SrcPatch $MAKEDIR/udev* $LFSSOURCE/$SRCPATH/udev-*-lib64-1.patch*
 		LIBDIR=lib64
 	else
 		LIBDIR=lib
 	fi
-	make -j $NUMCPU \
-	     CC="gcc ${BUILDOPTIONS}" \
-	     libudevdir=\${prefix}/$LIBDIR/udev \
-	     EXTRAS="extras/ata_id \
-	             extras/cdrom_id \
-		     extras/collect \
-		     extras/edd_id \
-		     extras/firmware \
-	             extras/floppy \
-		     extras/path_id \
-		     extras/rule_generator \
-		     extras/scsi_id \
-		     extras/usb_id \
-		     extras/volume_id" \
-	     udevdir=/dev
-
-	make DESTDIR=$TMPROOT \
-	     EXTRAS="extras/ata_id \
-	             extras/cdrom_id \
-		     extras/collect \
-		     extras/edd_id \
-		     extras/firmware \
-	             extras/floppy \
-		     extras/path_id \
-		     extras/rule_generator \
-		     extras/scsi_id \
-		     extras/usb_id \
-		     extras/volume_id" \
-	     udevdir=/dev install
+	CC="gcc ${BUILDOPTIONS}" \
+	CXX="g++ ${BUILDOPTIONS}" \
+	./configure --prefix=/usr \
+	            --exec_prefix= \
+		    --sysconfdir=/etc \
+		    --with-libdir-name=$LIBDIR
+	make -j $NUMCPU 
+	make DESTDIR=$TMPROOT  install
 }
 
 postmk() {
 	if [ "$MK64BIT" == "true" ]; then
-		ln ../lib64/udev $TMPROOT/lib/udev
 		LIBDIR=lib64
-		mkdir -p $TMPROOT/usr/lib64/pkgconfig
-		sed -e "s/\/lib/\/lib64/" \
-		    $TMPROOT/usr/lib/pkgconfig/libvolume_id.pc \
-		    >$TMPROOT/usr/lib64/pkgconfig/libvolume_id.pc
 	else
 		LIBDIR=lib
 	fi
 	mkdir -p $TMPROOT/usr/share/doc/udev
 	cp -a docs/* $TMPROOT/usr/share/doc/udev
-	cp udevstart udev $TMPROOT/sbin
 	cp etc/udev/* $TMPROOT/etc/udev
 	cp etc/udev/gentoo/* $TMPROOT/etc/udev/rules.d
 	sed -e "s/uucp/dialout/" etc/udev/gentoo/50-udev.rules |\
 	sed -e "s/GROUP=\"cdrom\"/GROUP=\"cdwrite\"/" |\
 	sed -e "s/cdrw/cdwrite/" >$TMPROOT/etc/udev/rules.d/50-udev.rules
-	for i in $TMPROOT/$LIBDIR/udev/*; do
-		cd $TMPROOT/sbin
-		ln -s $i 
-		cd -
+	cd $TMPROOT/lib/udev
+	for i in *; do
+		ln -s ../lib/udev/$i $TMPROOT/sbin/$i
 	done
+	ln -s ../lib/udev/vol_id $TMPROOT/sbin/volume_id
 	GetSVN Viitor_udev $TMPROOT
 	mknod $TMPROOT/dev/null c 1 3
 	mknod $TMPROOT/dev/console c 5 1
diff --git a/BaseBuild/Basesys/util-linux-ng b/BaseBuild/Basesys/util-linux-ng
index a897ba1..5fc26e9 100644
--- a/BaseBuild/Basesys/util-linux-ng
+++ b/BaseBuild/Basesys/util-linux-ng
@@ -69,19 +69,15 @@
 SRCPATH=Base/System
 
 premk() {
-	sed 's%etc/adjtime%var/lib/hwclock/adjtime%' hwclock/hwclock.c >/tmp/hwclock.c
-	mv /tmp/hwclock.c hwclock/hwclock.c
-	#sed -e 's%#include <linux/tqueue.h>%//#include <linux/tqueue.h>%' sys-utils/cytune.c >/tmp/cytune.c
-	#mv /tmp/cytune.c sys-utils/cytune.c
+	sed -i 's%etc/adjtime%var/lib/hwclock/adjtime%' hwclock/hwclock.c 
 }
 
 mk() {
 	if [ ${MK64BIT} == "true" ]; then
 		ADDOPTIONS="--libdir=\${prefix}/lib64"
 	fi
-	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+	CC="gcc ${BUILDOPTIONS} -L/lib64 -L/usr/lib64" \
+	./configure $ADDOPTIONS \
 		    --enable-partx \
 		    --disable-wall \
 		    --enable-write
@@ -95,4 +91,8 @@ mk() {
 
 postmk() {
 	mkdir -p $TMPROOT/var/lib/hwclock
+	if [ ! -d $TMPROOT/bin ]; then
+		mkdir -p $TMPROOT/bin
+	fi
+	mv $TMPROOT/usr/bin/logger $TMPROOT/bin
 }
diff --git a/BaseBuild/Basesys/vim b/BaseBuild/Basesys/vim
index ced862f..06f980f 100644
--- a/BaseBuild/Basesys/vim
+++ b/BaseBuild/Basesys/vim
@@ -82,8 +82,8 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET  \
-		    --prefix=/usr \
+	CXX="g++ ${BUILDOPTIONS}" \
+	./configure --prefix=/usr \
 		    --enable-multibyte
 	make -j $NUMCPU &&
 	make -j $NUMCPU prefix=$TMPROOT/usr localstatedir=$TMPROOT/var/lib/vim install
diff --git a/BaseBuild/Basesys/zlib b/BaseBuild/Basesys/zlib
index d1b2bc7..af61f69 100644
--- a/BaseBuild/Basesys/zlib
+++ b/BaseBuild/Basesys/zlib
@@ -106,7 +106,9 @@ mk32() {
 	mkdir -p $TMPROOT/lib
 	mv -v $TMPROOT/usr/lib/libz.so.* $TMPROOT/lib
 	ln -s ../../lib/libz.so.1 $TMPROOT/usr/lib/libz.so
-	chmod -v 644 /usr/lib/libz.a
+	mv /usr/lib/libz.a $TMPROOT/usr/lib/libz.a
+	chmod -v 644 $TMPROOT/usr/lib/libz.a
+	make distclean
 }
 
 #Hier wird der Make Prozess der Sourcen definiert
@@ -124,15 +126,16 @@ mk() {
 			   $ADDOPTIONS \
 			   --shared
 	make -j $NUMCPU &&
-	#make -j $NUMCPU libz.a &&
+	make -j $NUMCPU libz.a &&
 	make -j $NUMCPU prefix=$TMPROOT/usr $ADDMAKE install 
-	#if [ "$MK64BIT" == "true" ]; then
-		#make -j $NUMCPU libz.a
-	#fi
+	if [ "$MK64BIT" == "true" ]; then
+		make -j $NUMCPU libz.a
+	fi
 	mkdir -p $TMPROOT/$LIBDIR
+	mv libz.a $TMPROOT/usr/$LIBDIR
 	mv -v $TMPROOT/usr/$LIBDIR/libz.so.* $TMPROOT/$LIBDIR
 	ln -s ../../$LIBDIR/libz.so.1 $TMPROOT/usr/$LIBDIR/libz.so
-	chmod -v 644 /usr/$LIBDIR/libz.a
+	chmod -v 644 $TMPROOT/usr/$LIBDIR/libz.a
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann