Correction à cause de cet enfoiré de développeur de pkg++ qui casse toujours tout. :@

56 files changed, 127 insertions, 111 deletions

diff --git a/acl/Pkgfile b/acl/Pkgfile
index 05e5022..09b1e13 100644
--- a/acl/Pkgfile
+++ b/acl/Pkgfile
@@ -14,8 +14,8 @@ build ()
 	export DEBUG=-DNDEBUG;
 	export OPTIMIZER=$CFLAGS;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--bindir=/bin \
 		--libexecdir=$libdir \
diff --git a/attr/Pkgfile b/attr/Pkgfile
index a1a9247..0ed817d 100644
--- a/attr/Pkgfile
+++ b/attr/Pkgfile
@@ -14,8 +14,8 @@ build ()
 	export DEBUG=-DNDEBUG;
 	export OPTIMIZER=$CFLAGS;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--bindir=/bin \
 		--libexecdir=$libdir \
diff --git a/axel/Pkgfile b/axel/Pkgfile
index 6406635..39c9a22 100644
--- a/axel/Pkgfile
+++ b/axel/Pkgfile
@@ -20,6 +20,6 @@ build ()
 		--mandir=$mandir \
 		--strip=0;
 		 # strip is disabled because pkg++ will do the job later.
-	make CC=$CTARGET-gcc;
+	make CC=$CHOST-gcc;
 	make DESTDIR=$PKG install;
 }
diff --git a/bash/Pkgfile b/bash/Pkgfile
index 1ee19d2..6122221 100644
--- a/bash/Pkgfile
+++ b/bash/Pkgfile
@@ -13,8 +13,8 @@ build ()
 	cd $name-4.1;
 	gunzip -c $SRC/$name-4.1-001-009.patch.gz | patch -p0;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--exec-prefix= \
 		--mandir=$mandir \
diff --git a/btrfs-progs/Pkgfile b/btrfs-progs/Pkgfile
index 3a20a3b..3fcbc04 100644
--- a/btrfs-progs/Pkgfile
+++ b/btrfs-progs/Pkgfile
@@ -12,7 +12,7 @@ build ()
 { 
 	cd $name-unstable-$version;
 	patch -p1 -i $SRC/$name.diff;
-	make ${CTARGET:+CC=${CTARGET}-gcc};
+	make ${CHOST:+CC=${CHOST}-gcc};
 	install -d -m 755 $PKG$mandir/man8;
 	make prefix=/ bindir=/sbin mandir=$mandir DESTDIR=$PKG install
 }
diff --git a/bzip2/Pkgfile b/bzip2/Pkgfile
index e124ee2..81dbf0b 100644
--- a/bzip2/Pkgfile
+++ b/bzip2/Pkgfile
@@ -11,10 +11,10 @@ source=(http://www.bzip.org/$version/$name-$version.tar.gz bzip2.patch)
 build () 
 {
 	local makeopts=(
-		${CTARGET:+CC=${CTARGET}-gcc}
-		${CTARGET:+AR=${CTARGET}-ar}
-		${CTARGET:+RANLIB=${CTARGET}-ranlib}
-		${CTARGET:+LD=${CTARGET}-ld}
+		${CHOST:+CC=${CHOST}-gcc}
+		${CHOST:+AR=${CHOST}-ar}
+		${CHOST:+RANLIB=${CHOST}-ranlib}
+		${CHOST:+LD=${CHOST}-ld}
 	)
 	cd $name-$version;
 	patch -Np1 -i $SRC/$name.patch;
diff --git a/coreutils/Pkgfile b/coreutils/Pkgfile
index 40c0f70..f0771ba 100644
--- a/coreutils/Pkgfile
+++ b/coreutils/Pkgfile
@@ -13,8 +13,8 @@ build ()
 	cd $name-$version;
 	patch -p1 -i $SRC/coreutils-uname.patch;
 	./configure \
-		${CTARGET:+--host=${CTARGET}} \
-		${CHOST:+--build=${CHOST}} \
+		${CHOST:+--host=${CHOST}} \
+		${CBUILD:+--build=${CBUILD}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		$(use_enable nls) \
diff --git a/curl/Pkgfile b/curl/Pkgfile
index 592aace..6a6bd56 100644
--- a/curl/Pkgfile
+++ b/curl/Pkgfile
@@ -13,8 +13,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--enable-ipv6;
diff --git a/db/Pkgfile b/db/Pkgfile
index a1857a5..2deddad 100644
--- a/db/Pkgfile
+++ b/db/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version/build_unix;
 	../dist/configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--enable-compat185 \
 		--enable-shared \
diff --git a/dhcpcd/Pkgfile b/dhcpcd/Pkgfile
index 6e102ce..931382f 100644
--- a/dhcpcd/Pkgfile
+++ b/dhcpcd/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix= \
 		--libexecdir=/lib/dhcpcd \
 		--dbdir=/var/lib/dhcpcd \
diff --git a/diffutils/Pkgfile b/diffutils/Pkgfile
index e7a0b9f..ef7d05b 100644
--- a/diffutils/Pkgfile
+++ b/diffutils/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		$(use_enable nls);
diff --git a/e2fsprogs/Pkgfile b/e2fsprogs/Pkgfile
index 4d9b445..839073a 100644
--- a/e2fsprogs/Pkgfile
+++ b/e2fsprogs/Pkgfile
@@ -5,15 +5,15 @@ url="http://e2fsprogs.sourceforge.net/"
 depends=(util-linux-ng)
 
 name=e2fsprogs
-version=1.41.12
+version=1.41.14
 release=1
-source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz)
+includes=(sourceforge)
 build () 
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--with-root-prefix= \
 		--mandir=$mandir \
diff --git a/ed/Pkgfile b/ed/Pkgfile
index 0d1ab00..64bd150 100644
--- a/ed/Pkgfile
+++ b/ed/Pkgfile
@@ -16,6 +16,6 @@ build ()
 		--exec-prefix=/ \
 		--mandir=$mandir \
 		CFLAGS="$CFLAGS";
-	make ${CTARGET:+CC=$CTARGET-gcc};
+	make ${CHOST:+CC=$CHOST-gcc};
 	make DESTDIR=$PKG install;
 }
diff --git a/file/Pkgfile b/file/Pkgfile
index 5538242..c636cb7 100644
--- a/file/Pkgfile
+++ b/file/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--enable-fsect-man5;
diff --git a/findutils/Pkgfile b/findutils/Pkgfile
index 56a03d3..6837e66 100644
--- a/findutils/Pkgfile
+++ b/findutils/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		$(use_enable nls);
diff --git a/gettext/Pkgfile b/gettext/Pkgfile
index c018fe9..16f3ae4 100644
--- a/gettext/Pkgfile
+++ b/gettext/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--disable-csharp \
diff --git a/glibc/Pkgfile b/glibc/Pkgfile
index d981fd7..bf06ca0 100644
--- a/glibc/Pkgfile
+++ b/glibc/Pkgfile
@@ -33,8 +33,8 @@ build ()
 	mkdir build;
 	cd build;
 	../$name-$version/configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--libexecdir=$libdir \
 		--with-headers=$PKG$prefix/include \
diff --git a/grep/Pkgfile b/grep/Pkgfile
index f4ff6e4..a798b76 100644
--- a/grep/Pkgfile
+++ b/grep/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		$(use_enable nls) \
 		--mandir=$mandir;
diff --git a/groff/Pkgfile b/groff/Pkgfile
index 9df3cfa..d587e2e 100644
--- a/groff/Pkgfile
+++ b/groff/Pkgfile
@@ -13,12 +13,12 @@ build ()
 	cd $name-$version;
 	touch doc/gnu.eps;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--without-x;
-	if [[ "$CHOST" = "$CTARGET" ]]; then
+	if [[ "$CBUILD" = "$CHOST" ]]; then
 		make;
 	else
 		# This will need troff and groff already available at build time on the host.
diff --git a/httpup/Pkgfile b/httpup/Pkgfile
index 6656741..f9feeab 100644
--- a/httpup/Pkgfile
+++ b/httpup/Pkgfile
@@ -12,7 +12,7 @@ build ()
 { 
 	cd $name-$version;
 	sed -i -e "s|-Werror|$CFLAGS|" Makefile;
-	make;
+	make ${CHOST:+CXX=$CHOST-g++};
 	mkdir -p $PKG/usr/{bin,share/man/man8};
 	cp httpup httpup-repgen $PKG/usr/bin;
 	install -D -m 755 $SRC/httpup $PKG/etc/ports/drivers/httpup;
diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile
index a75c1ae..3864ddc 100644
--- a/iproute2/Pkgfile
+++ b/iproute2/Pkgfile
@@ -12,7 +12,7 @@ build ()
 { 
 	cd $name-$version;
 	sed -i "s|-O2|$CFLAGS -DIPT_LIB_DIR=\\\\\"$prefix/lib/xtables\\\\\"|" Makefile;
-	make ${CTARGET:+CC=$CTARGET-gcc};
+	make ${CHOST:+CC=$CHOST-gcc};
 	make MANDIR=$mandir DESTDIR=$PKG install;
 	
 	install -d $PKG/{{s,}bin,$prefix/{${mandir/$prefix}/man8,sbin}}
diff --git a/jfsutils/Pkgfile b/jfsutils/Pkgfile
index 7961359..b5726ac 100644
--- a/jfsutils/Pkgfile
+++ b/jfsutils/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CTARGET:+--host=$CTARGET} \
-		${CHOST:+--build=$CHOST} \
+		${CHOST:+--host=$CHOST} \
+		${CBUILD:+--build=$CBUILD} \
 		--prefix=/ \
 		--mandir=$mandir;
 	make;
diff --git a/kbd/Pkgfile b/kbd/Pkgfile
index d940e17..111faa5 100644
--- a/kbd/Pkgfile
+++ b/kbd/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--datadir=$sharedir/kbd \
diff --git a/less/Pkgfile b/less/Pkgfile
index 6fbb364..76c0326 100644
--- a/less/Pkgfile
+++ b/less/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir;
 	make;
diff --git a/libarchive/Pkgfile b/libarchive/Pkgfile
index 5760b41..cb9c77c 100644
--- a/libarchive/Pkgfile
+++ b/libarchive/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd libarchive-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--without-lzmadec \
diff --git a/libcap/Pkgfile b/libcap/Pkgfile
index a623ec6..f904c8a 100644
--- a/libcap/Pkgfile
+++ b/libcap/Pkgfile
@@ -11,11 +11,12 @@ source=(ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$name-$
 build () 
 { 
 	cd libcap-$version;
-	sed -i '/^CFLAGS :=/s/:/\?/' Make.Rules;
+	sed -i -e '/^CFLAGS :=/s/:/\?/' Make.Rules;
+	sed -i -e '/^CC .=/s/.*/CC = '"${CHOST:+$CHOST-}gcc"'/' Make.Rules;
 	make;
-	make DESTDIR=$PKG man_prefix=$mandir install;
-	install -d $PKG/usr/lib;
-	mv $PKG/lib/libcap.a $PKG/usr/lib;
+	make ${CHOST:+CC=$CHOST-gcc} DESTDIR=$PKG man_prefix=$mandir install;
+	install -d $PKG$libdir;
+	mv $PKG/lib/libcap.a $PKG$libdir;
 	rm $PKG/lib/libcap.so;
-	ln -s ../../lib/libcap.so.$version $PKG/usr/lib/libcap.so
+	ln -s ../../lib/libcap.so.$version $PKG$libdir/libcap.so
 }
diff --git a/libdevmapper/Pkgfile b/libdevmapper/Pkgfile
index a3a4a3d..4b8c00d 100644
--- a/libdevmapper/Pkgfile
+++ b/libdevmapper/Pkgfile
@@ -13,8 +13,8 @@ build ()
 	cd LVM2.2.02.79;
 	patch -p1 -i $SRC/lvm2-static_build.patch;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--sbindir=/sbin \
 		--libdir=/lib \
diff --git a/libpcre/Pkgfile b/libpcre/Pkgfile
index 53b7c19..7fe1fda 100644
--- a/libpcre/Pkgfile
+++ b/libpcre/Pkgfile
@@ -13,8 +13,8 @@ build ()
 	cd pcre-$version;
 	# Les bibliothèques sont installées dans /lib à cause de zsh.
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--libdir=${libdir/$prefix} \
 		--mandir=$mandir \
diff --git a/libusb/Pkgfile b/libusb/Pkgfile
index 11b2a23..6577bc2 100644
--- a/libusb/Pkgfile
+++ b/libusb/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir;
 	make;
diff --git a/man/Pkgfile b/man/Pkgfile
index 2889eea..8f2802b 100644
--- a/man/Pkgfile
+++ b/man/Pkgfile
@@ -18,7 +18,7 @@ build ()
 		-compatibility_mode_for_colored_groff \
 		+lang none \
 		-default;
-	make ${CTARGET:+CC=$CTARGET-gcc};
+	make ${CHOST:+CC=$CHOST-gcc};
 	make PREFIX=$PKG install;
 	install -D -m 755 $SRC/makewhatis $PKG/etc/cron/daily/makewhatis
 }
diff --git a/mlocate/Pkgfile b/mlocate/Pkgfile
index 8b3cc35..16d280c 100644
--- a/mlocate/Pkgfile
+++ b/mlocate/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--sysconfdir=$sysconfdir \
diff --git a/module-init-tools/Pkgfile b/module-init-tools/Pkgfile
index f725738..ea72d19 100644
--- a/module-init-tools/Pkgfile
+++ b/module-init-tools/Pkgfile
@@ -13,8 +13,8 @@ build ()
 	cd $name-$version;
 	touch *.5 *.8;
 	./configure \
-		${CHOST:+-build=${CHOST}} \
-		${CTARGET:+-host=${CTARGET}} \
+		${CBUILD:+-build=${CBUILD}} \
+		${CHOST:+-host=${CHOST}} \
 		--prefix=$prefix \
 		--bindir=/sbin \
 		--sbindir=/sbin;
diff --git a/ncurses/Pkgfile b/ncurses/Pkgfile
index bf8fec3..2b66589 100644
--- a/ncurses/Pkgfile
+++ b/ncurses/Pkgfile
@@ -8,12 +8,13 @@ name=ncurses
 version=5.7
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
+
 build () 
 { 
 	cd $name-$version;
 	local opts=(
-		${CHOST:+-build=${CHOST}}
-		${CTARGET:+-host=${CTARGET}}
+		${CBUILD:+-build=${CBUILD}}
+		${CHOST:+-host=${CHOST}}
 		--with-install-prefix=$PKG
 		--prefix=$prefix
 		--with-normal
diff --git a/net-tools/Pkgfile b/net-tools/Pkgfile
index 86f3c8e..3958f44 100644
--- a/net-tools/Pkgfile
+++ b/net-tools/Pkgfile
@@ -31,6 +31,6 @@ build ()
 	patch -p1 < ../$name-$version-virtualname.patch;
 	patch -p1 < ../$name-$version-ipv6.patch;
 	patch -p1 < ../$name-$version-miiioctl.patch;
-	make -j1 ${CTARGET:+CC=$CTARGET-gcc} COPTS="$CFLAGS -D_GNU_SOURCE -Wall";
+	make -j1 ${CHOST:+CC=$CHOST-gcc} COPTS="$CFLAGS -D_GNU_SOURCE -Wall";
 	make BASEDIR=$PKG mandir=$mandir install
 }
diff --git a/openssh/Pkgfile b/openssh/Pkgfile
index 9b71d75..75e5255 100644
--- a/openssh/Pkgfile
+++ b/openssh/Pkgfile
@@ -15,8 +15,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+-build=${CHOST}} \
-		${CTARGET:+-host=${CTARGET}} \
+		${CBUILD:+-build=${CBUILD}} \
+		${CHOST:+-host=${CHOST}} \
 		--prefix=$prefix \
 		--libexecdir=$libdir/ssh \
 		--sysconfdir=$sysconfdir/ssh \
diff --git a/openssl/Pkgfile b/openssl/Pkgfile
index 6d2be80..437fbac 100644
--- a/openssl/Pkgfile
+++ b/openssl/Pkgfile
@@ -16,7 +16,7 @@ build ()
 		--openssldir=/etc/ssl \
 		shared;
 	sed -i -e "s|-O3 -fomit-frame-pointer|$CFLAGS|" Makefile;
-	make -j1 ${CTARGET:+CC=$CTARGET-gcc RANLIB=$CTARGET-ranlib};
+	make -j1 ${CHOST:+CC=$CHOST-gcc RANLIB=$CHOST-ranlib};
 	make INSTALL_PREFIX=$PKG LIBDIR=lib MANDIR=$mandir MANSUFFIX=ssl install;
 	find $PKG -name "*fips*" -delete;
 	chmod -R +w $PKG;
diff --git a/pigz/Pkgfile b/pigz/Pkgfile
index a3885d6..27c154d 100644
--- a/pigz/Pkgfile
+++ b/pigz/Pkgfile
@@ -13,7 +13,7 @@ build() {
 	cd $name-$version
 	sed -i -e 's|	cc|	$(CC)|' Makefile
 	make \
-		${CTARGET:+CC=$CTARGET-gcc} \
+		${CHOST:+CC=$CHOST-gcc} \
 		CFLAGS="$CFLAGS"
 	mkdir -p $PKG$bindir $PKG$mandir/man1
 	install -m0755 pigz $PKG$bindir/pigz
diff --git a/pkgutils/Pkgfile b/pkgutils/Pkgfile
index 5c1aa93..e576a44 100644
--- a/pkgutils/Pkgfile
+++ b/pkgutils/Pkgfile
@@ -11,5 +11,5 @@ source=(http://crux.nu/files/$name-$version.tar.gz)
 build () 
 { 
 	cd $name-$version;
-	make DESTDIR=$PKG MANDIR=$mandir install
+	make ${CHOST:+CXX=$CHOST-g++} DESTDIR=$PKG MANDIR=$mandir install
 }
diff --git a/procps/Pkgfile b/procps/Pkgfile
index 57e8200..8aa1756 100644
--- a/procps/Pkgfile
+++ b/procps/Pkgfile
@@ -18,7 +18,7 @@ build ()
 	cd $name-$version;
 	patch -p1 -i $SRC/$name-$version.patch;
 	patch -p0 -i $SRC/$name-$version-linux-ver-init.patch;
-	make ${CTARGET:+CC=$CTARGET-gcc};
+	make ${CHOST:+CC=$CHOST-gcc};
 	make DESTDIR=$PKG install;
 	install -D -m644 $SRC/sysctl.conf $PKG/etc/sysctl.conf
 	mkdir $PKG$prefix/share
diff --git a/prt-get/Pkgfile b/prt-get/Pkgfile
index 5161291..443fe68 100644
--- a/prt-get/Pkgfile
+++ b/prt-get/Pkgfile
@@ -13,8 +13,8 @@ build ()
 	cd ${name}-${version};
 	patch -p1 -i $SRC/$name.diff;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir;
 	make;
diff --git a/readline/Pkgfile b/readline/Pkgfile
index e6b22ea..3170bdf 100644
--- a/readline/Pkgfile
+++ b/readline/Pkgfile
@@ -13,8 +13,8 @@ build ()
 	cd $name-6.1;
 	gunzip -c $SRC/$name-6.1-001-002.patch.gz | patch -p0;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir;
 	make SHLIB_LIBS=-lncurses;
diff --git a/reiserfsprogs/Pkgfile b/reiserfsprogs/Pkgfile
index 812e0b5..40113f1 100644
--- a/reiserfsprogs/Pkgfile
+++ b/reiserfsprogs/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=/ \
 		--mandir=$mandir;
 	make;
diff --git a/sed/Pkgfile b/sed/Pkgfile
index a08fe8f..0010e93 100644
--- a/sed/Pkgfile
+++ b/sed/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--exec-prefix=/ \
diff --git a/shadow/Pkgfile b/shadow/Pkgfile
index 28b671a..6d4e55a 100644
--- a/shadow/Pkgfile
+++ b/shadow/Pkgfile
@@ -11,7 +11,13 @@ source=(ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/$name-$version.tar.bz2
 build () 
 { 
 	cd $name-$version;
+	# FIXME: Problème de portabilité ?
+	if [[ "$CBUILD" != "$CHOST" ]]; then
+		echo "ac_cv_func_setpgrp_void=yes" > config.cache
+	fi
 	./configure \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--sysconfdir=$sysconfdir \
@@ -20,7 +26,8 @@ build ()
 		$(use_enable nls) \
 		--without-selinux \
 		--without-libpam \
-		--without-audit;
+		--without-audit \
+		--cache-file=config.cache;
 	make;
 	make DESTDIR=$PKG install;
 	install -d $PKG/etc/cron/daily $PKG/var/log;
diff --git a/sysfsutils/Pkgfile b/sysfsutils/Pkgfile
index 1f18657..50aac89 100644
--- a/sysfsutils/Pkgfile
+++ b/sysfsutils/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir;
 	make;
diff --git a/sysklogd/Pkgfile b/sysklogd/Pkgfile
index 8acaedd..ff1051e 100644
--- a/sysklogd/Pkgfile
+++ b/sysklogd/Pkgfile
@@ -7,13 +7,13 @@ depends=()
 name=sysklogd
 version=1.5
 release=4
-source=(http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-1.5.tar.gz rotatelog syslog syslog.conf sysklogd)
+source=(http://www.ibiblio.org/pub/Linux/system/daemons/$name-$version.tar.gz rotatelog syslog syslog.conf sysklogd)
 build () 
 { 
 	cd $name-$version;
 	sed -i -e '192d' ksym_mod.c;
 	mkdir -p $PKG/usr/sbin $PKG/etc/{cron/weekly,rc.d} $PKG/var/log $PKG$mandir/{man5,man8};
-	make RPM_OPT_FLAGS="$CFLAGS" all;
+	make ${CHOST:+CC=$CHOST-gcc STRIP=$CHOST-strip} RPM_OPT_FLAGS="$CFLAGS" all;
 	make BINDIR=$PKG/usr/sbin MANDIR=$PKG$mandir install;
 	install -m 755 $SRC/rotatelog $PKG/usr/sbin;
 	install -m 755 $SRC/syslog $PKG/etc/cron/weekly;
diff --git a/tcp_wrappers/Pkgfile b/tcp_wrappers/Pkgfile
index 2bebfa2..5fa5f75 100644
--- a/tcp_wrappers/Pkgfile
+++ b/tcp_wrappers/Pkgfile
@@ -27,10 +27,10 @@ build ()
 	patch -p1 -i $SRC/$version/tcp-wrappers-$version-shared.patch;
 	patch -p2 -i $SRC/$version/tcp-wrappers-$version-ipv6-1.14.diff;
 	export GENTOO_OPT="-DHAVE_WEAKSYMS -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len";
-	export RANLIB=${CTARGET:+$CTARGET-}ranlib;
+	export RANLIB=${CHOST:+$CHOST-}ranlib;
 	export MAJOR=0 MINOR=${version:0:1} REL=${version:2:3};
 	make config-check;
-	make ${CTARGET:+CC=$CTARGET-gcc} linux;
+	make ${CHOST:+CC=$CHOST-gcc} linux;
 	install -d $PKG/{etc,usr/{sbin,lib,include,},$mandir/{man3,man5,man8}};
 	install -m 0755 safe_finger tcpd tcpdchk tcpdmatch try-from $PKG/usr/sbin;
 	install -m 0644 tcpd.h $PKG/usr/include;
diff --git a/time/Pkgfile b/time/Pkgfile
index 70d7046..041d30e 100644
--- a/time/Pkgfile
+++ b/time/Pkgfile
@@ -10,11 +10,14 @@ release=1
 source=(http://ftp.gnu.org/gnu/time/$name-$version.tar.gz time.1)
 build () 
 { 
-    cd $name-$version;
-    ./configure --prefix=$prefix;
-    make;
-    make prefix=$PKG$prefix install;
-    #rm -rf $PKG/usr/info;
-    mkdir -p $PKG$mandir/man1;
-    cp ../$name.1 $PKG$mandir/man1
+	cd $name-$version;
+	./configure \
+		${CHOST:+--host=$CHOST} \
+		${CBUILD:+--build=$CBUILD} \
+		--prefix=$prefix;
+	make;
+	make prefix=$PKG$prefix install;
+	#rm -rf $PKG/usr/info;
+	mkdir -p $PKG$mandir/man1;
+	cp ../$name.1 $PKG$mandir/man1
 }
diff --git a/udev/Pkgfile b/udev/Pkgfile
index 47f63a8..2b48cc4 100644
--- a/udev/Pkgfile
+++ b/udev/Pkgfile
@@ -15,6 +15,8 @@ build ()
 { 
 	cd udev-$version;
 	./configure \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--exec-prefix= \
 		--sysconfdir=$sysconfdir \
diff --git a/util-linux-ng/Pkgfile b/util-linux-ng/Pkgfile
index 375c170..f9ad7a1 100644
--- a/util-linux-ng/Pkgfile
+++ b/util-linux-ng/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		$(use_enable nls) \
diff --git a/vim/Pkgfile b/vim/Pkgfile
index c659abd..82201fd 100644
--- a/vim/Pkgfile
+++ b/vim/Pkgfile
@@ -13,6 +13,8 @@ build ()
 	cd vim73/src;
 	unxz -c $SRC/vim-7.3.*.xz | patch -p0 -d $SRC/vim73;
 	./configure \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--with-vim-name=vim \
@@ -35,6 +37,8 @@ build ()
 	ln -sf vim.1.gz $PKG$mandir/man1/rview.1.gz;
 	ln -sf vim.1.gz $PKG$mandir/man1/gvim.1.gz;
 	./configure \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=/ \
 		--with-vim-name=vi \
 		--with-x=no \
diff --git a/which/Pkgfile b/which/Pkgfile
index fc7484c..ec86263 100644
--- a/which/Pkgfile
+++ b/which/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir;
 	make;
diff --git a/xfsprogs/Pkgfile b/xfsprogs/Pkgfile
index d4bf142..ceae977 100644
--- a/xfsprogs/Pkgfile
+++ b/xfsprogs/Pkgfile
@@ -10,17 +10,15 @@ release=1
 source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/$name-$version.tar.gz)
 build () 
 {
-	if use nls; then
-		opts=(--enable-gettext)
-	else
-		opts=(--disable-gettext)
-	fi
 	cd $name-$version;
 	export DEBUG=-DNDEBUG;
 	export OPTIMIZER=$CFLAGS;
 	./configure \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
+		$(use_enable nls gettext) \
 		${opts[@]};
 	make;
 	make DIST_ROOT=$PKG install install-dev;
diff --git a/xz/Pkgfile b/xz/Pkgfile
index fef3f68..d754f82 100644
--- a/xz/Pkgfile
+++ b/xz/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		$(use_enable nls) \
diff --git a/zlib/Pkgfile b/zlib/Pkgfile
index 8c39e07..dd76f54 100644
--- a/zlib/Pkgfile
+++ b/zlib/Pkgfile
@@ -15,7 +15,7 @@ build ()
 { 
 	cd $name-$version;
 	patch -p1 -i $SRC/$name-$version-lfs-decls.patch;
-	CHOST=$CTARGET ./configure \
+	CBUILD=$CHOST ./configure \
 		--shared \
 		--prefix=$prefix;
 	make;
diff --git a/zsh/Pkgfile b/zsh/Pkgfile
index 0d58a34..187d33a 100644
--- a/zsh/Pkgfile
+++ b/zsh/Pkgfile
@@ -15,8 +15,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--bindir=${bindir/$prefix} \
 		--libdir=$libdir \