From e630a0da35de63ab002de0219551c0445364236b Mon Sep 17 00:00:00 2001
From: Lukc <lukc@upyum.com>
Date: Tue, 21 Dec 2010 00:16:39 +0100
Subject: Mise à jour de la recette de bzip2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bzip2/.footprint | 21 ++++++++-------------
 bzip2/.md5sum    |  2 +-
 bzip2/.sha256sum |  2 +-
 bzip2/Pkgfile    | 30 +++++++++++++++++++-----------
 4 files changed, 29 insertions(+), 26 deletions(-)

(limited to 'bzip2')

diff --git a/bzip2/.footprint b/bzip2/.footprint
index 2c1ca92..45f15f2 100644
--- a/bzip2/.footprint
+++ b/bzip2/.footprint
@@ -18,16 +18,11 @@ drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libbz2.so -> libbz2.so.1.0
 lrwxrwxrwx	root/root	usr/lib/libbz2.so.1.0 -> libbz2.so.1.0.6
 -rwxr-xr-x	root/root	usr/lib/libbz2.so.1.0.6
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
-lrwxrwxrwx	root/root	usr/man/man1/bunzip2.1.gz -> bzip2.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/bzcat.1.gz -> bzip2.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/bzcmp.1.gz -> bzdiff.1.gz
--rw-r--r--	root/root	usr/man/man1/bzdiff.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/bzegrep.1.gz -> bzgrep.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/bzfgrep.1.gz -> bzgrep.1.gz
--rw-r--r--	root/root	usr/man/man1/bzgrep.1.gz
--rw-r--r--	root/root	usr/man/man1/bzip2.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/bzip2recover.1.gz -> bzip2.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/bzless.1.gz -> bzmore.1.gz
--rw-r--r--	root/root	usr/man/man1/bzmore.1.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/share/
+drwxr-xr-x	root/root	usr/share/man/share/man1/
+-rw-r--r--	root/root	usr/share/man/share/man1/bzdiff.1
+-rw-r--r--	root/root	usr/share/man/share/man1/bzgrep.1
+-rw-r--r--	root/root	usr/share/man/share/man1/bzip2.1
+-rw-r--r--	root/root	usr/share/man/share/man1/bzmore.1
diff --git a/bzip2/.md5sum b/bzip2/.md5sum
index fb5468a..7197291 100644
--- a/bzip2/.md5sum
+++ b/bzip2/.md5sum
@@ -1,2 +1,2 @@
-00b516f4704d4a7cb50a1d97e6e8e15b  bzip2-1.0.6.tar.gz
+67e35dd19dc2c66a00cf4d252d0208d2  bzip2-1.0.6.tar.gz
 21bba891a5e515d69fa6ca6b11eac726  bzip2.patch
diff --git a/bzip2/.sha256sum b/bzip2/.sha256sum
index 7e8f689..6415cbd 100644
--- a/bzip2/.sha256sum
+++ b/bzip2/.sha256sum
@@ -1,2 +1,2 @@
-a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd  bzip2-1.0.6.tar.gz
+63fdf9a38bab638230fde698e166ffac3be0972dc1fc990bc17d7dbc713e31c0  bzip2-1.0.6.tar.gz
 45715e151b26b7c9731bd59934ae6aa6f1b5d48332f23aed2d71667eada1fb76  bzip2.patch
diff --git a/bzip2/Pkgfile b/bzip2/Pkgfile
index ac9a271..e124ee2 100644
--- a/bzip2/Pkgfile
+++ b/bzip2/Pkgfile
@@ -1,19 +1,27 @@
-description="Very high-quality data compression program"
-packager=""
-maintainer="CRUX System Team, core-ports at crux dot nu"
+description="Very high-quality data compression program."
+packager="CRUX System Team <core-ports AT crux DOT nu>"
+maintainer="Lukc <lukc AT upyum DOT com>"
 url="http://www.bzip.org/"
 depends=()
 
 name=bzip2
 version=1.0.6
 release=1
-source=(http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz bzip2.patch)
+source=(http://www.bzip.org/$version/$name-$version.tar.gz bzip2.patch)
 build () 
-{ 
-    cd $name-$version;
-    patch -Np1 -i $SRC/$name.patch;
-    make;
-    make PREFIX=$PKG/usr install;
-    make -f Makefile-libbz2_so;
-    make -f Makefile-libbz2_so PREFIX=$PKG/usr install
+{
+	local makeopts=(
+		${CTARGET:+CC=${CTARGET}-gcc}
+		${CTARGET:+AR=${CTARGET}-ar}
+		${CTARGET:+RANLIB=${CTARGET}-ranlib}
+		${CTARGET:+LD=${CTARGET}-ld}
+	)
+	cd $name-$version;
+	patch -Np1 -i $SRC/$name.patch;
+	sed -i -e "/all:/ s| test||" Makefile;
+	sed -i -e "s|/man|${mandir/$prefix}|g" Makefile;
+	make ${makeopts[@]};
+	make PREFIX=$PKG$prefix MANDIR=$PKG$mandir install;
+	make -f Makefile-libbz2_so ${makeopts};
+	make -f Makefile-libbz2_so PREFIX=$PKG$prefix MANDIR=$PKG$mandir install
 }
-- 
cgit v1.2.3-70-g09d2