Foutu mainteneur de pkg++, alors.

13 files changed, 53 insertions, 31 deletions

diff --git a/autoconf/Pkgfile b/autoconf/Pkgfile
index e8545fd..4d14c13 100644
--- a/autoconf/Pkgfile
+++ b/autoconf/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=$PKG$mandir;
 	make;
diff --git a/automake/Pkgfile b/automake/Pkgfile
index d1bf2c1..dc165c3 100644
--- a/automake/Pkgfile
+++ b/automake/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/binutils/Pkgfile b/binutils/Pkgfile
index f87a704..88694cd 100644
--- a/binutils/Pkgfile
+++ b/binutils/Pkgfile
@@ -4,10 +4,10 @@ maintainer="Lukc <lukc AT upyum DOT com>"
 url="http://sources.redhat.com/binutils/"
 depends=(zlib)
 
-if [[ -z ${CROSS_TARGET} ]]; then
+if [[ -z ${CTARGET} ]]; then
 	name=binutils
 else
-	name=binutils-$CROSS_TARGET
+	name=binutils-$CTARGET
 fi
 name=binutils
 version=2.21
@@ -19,15 +19,16 @@ build ()
 	sed -i '/^# RELEASE=y/s/#//' $name-$version/bfd/Makefile.in;
 	mkdir build;
 	cd build;
-	if [[ -n $CROSS_TRIPLET ]]; then
-		info "Building $name for $CROSS_TRIPLET."
+	if [[ -n $CTARGET ]]; then
+		info "Building $name for $CTARGET."
 	fi
 	../$name-$version/configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
-		${CROSS_TRIPLET:+--target=${CROSS_TRIPLET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
+		${CTARGET:+--target=${CTARGET}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
+		$(use_enable static) \
 		--enable-shared \
 		$(use_enable nls);
 	make tooldir=$prefix;
diff --git a/bison/Pkgfile b/bison/Pkgfile
index 22cf536..05c62ff 100644
--- a/bison/Pkgfile
+++ b/bison/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/expat/Pkgfile b/expat/Pkgfile
index d044501..16ba5b1 100644
--- a/expat/Pkgfile
+++ b/expat/Pkgfile
@@ -18,8 +18,8 @@ build ()
 	patch -p0 -d lib -i $SRC/expat-CVE-2009-3560.patch;
 	patch -p0 -d lib -i $SRC/expat-CVE-2009-3720.patch;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=/usr;
 	make;
 	make prefix=$PKG/usr install
diff --git a/flex/Pkgfile b/flex/Pkgfile
index 3da81b4..8d2fea5 100644
--- a/flex/Pkgfile
+++ b/flex/Pkgfile
@@ -13,8 +13,8 @@ build ()
 	cd $name-$version;
 	patch -p1 -i $SRC/$name-$version-gcc44-1.patch;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		$(use_enable nls);
diff --git a/gawk/Pkgfile b/gawk/Pkgfile
index 9d55300..3acf569 100644
--- a/gawk/Pkgfile
+++ b/gawk/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd $name-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--libexecdir=$libdir \
 		--mandir=$mandir \
diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index 56bdb8d..ab8714a 100644
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -4,10 +4,10 @@ maintainer="Lukc <lukc AT upyum DOT com>"
 url="http://$name.gnu.org"
 depends=(binutils zlib libmpc)
 
-if [[ -z ${CROSS_TRIPLET} ]]; then
+if [[ -z ${CTARGET} ]]; then
 	name=gcc
 else
-	name=gcc-$CROSS_TRIPLET
+	name=gcc-$CTARGET
 fi
 version=4.5.2
 release=1
@@ -23,9 +23,9 @@ build ()
 	mkdir build;
 	cd build;
 	../gcc-$version/configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
-		${CROSS_TRIPLET:+--target=${CROSS_TRIPLET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
+		${CTARGET:+--target=${CTARGET}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--libexecdir=$libdir \
@@ -38,7 +38,7 @@ build ()
 		--with-x=no \
 		--with-system-zlib \
 		--with-pkgversion="Nutritive";
-	if [[ -z "${CROSS_TRIPLET}" ]]; then
+	if [[ -z "${CTARGET}" ]]; then
 		make bootstrap;
 	else
 		make;
diff --git a/gdbm/Pkgfile b/gdbm/Pkgfile
index dccd6d9..3c139b1 100644
--- a/gdbm/Pkgfile
+++ b/gdbm/Pkgfile
@@ -13,8 +13,8 @@ build ()
 	cd $name-$version;
 	patch -p1 -i $SRC/$name-$version-compat-linking.patch;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--includedir=$prefix/include/gdbm;
 	make;
diff --git a/git/Pkgfile b/git/Pkgfile
index 9570217..7f95228 100644
--- a/git/Pkgfile
+++ b/git/Pkgfile
@@ -19,7 +19,7 @@ build() {
 	sed -i perl/Makefile.PL -e '23,24d' -e '26d'
 	sed -i Makefile -e 's|CFLAGS =|CFLAGS :=|'
 	
-	make ${CTARGET:+CC="$CTARGET-gcc"} CFLAGS="$CFLAGS" \
+	make ${CHOST:+CC="$CHOST-gcc"} CFLAGS="$CFLAGS" \
 		prefix=$prefix gitexecdir=$libdir/git-core \
 		DESTDIR=$PKG install
 	
diff --git a/gmake/Pkgfile b/gmake/Pkgfile
index 00743c0..0d4d8b7 100644
--- a/gmake/Pkgfile
+++ b/gmake/Pkgfile
@@ -12,8 +12,8 @@ build ()
 { 
 	cd make-$version;
 	./configure \
-		${CHOST:+--build=${CHOST}} \
-		${CTARGET:+--host=${CTARGET}} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CHOST:+--host=${CHOST}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--program-prefix=g \
diff --git a/make/Pkgfile b/make/Pkgfile
index cfa78b4..b548ef1 100644
--- a/make/Pkgfile
+++ b/make/Pkgfile
@@ -12,7 +12,7 @@ source=(ftp://ftp.de.debian.org/debian/pool/main/p/pmake/${name}_${version}.orig
 build () {
 	cd pmake
 	make -f Makefile.boot \
-		${CTARGET:+CC=$CTARGET-gcc} \
+		${CHOST:+CC=$CHOST-gcc} \
 		CFLAGS="$CFLAGS -DHAVE_STRDUP -DHAVE_STRERROR"
 	mkdir -pv $PKG$bindir
 	install -m0755 bmake $PKG$bindir/pmake
diff --git a/pkg++/Pkgfile b/pkg++/Pkgfile
new file mode 100644
index 0000000..5a6c237
--- /dev/null
+++ b/pkg++/Pkgfile
@@ -0,0 +1,21 @@
+description="Portable package builder."
+url=http://devel.upyum.com/cgit.cgi/pkg++
+packager="Lukc <lukc AT upyum DOT com>"
+maintainer="Lukc <lukc AT upyum DOT com>"
+
+name=pkg++
+version=devel
+release=1
+source=( 
+	git://devel.upyum.com/pkgxx.git
+)
+
+depends=(bash pkgutils)
+
+build(){
+	cd $name
+	./configure \
+		--package-manager=pkgutils \
+		${configure_opts[@]}
+	pkgmake -B DESTDIR=$PKG install
+}