[arch-commits] Commit in bzip2/trunk (PKGBUILD)

[Allan McRae]

    Date: Friday, March 20, 2009 @ 22:13:23
  Author: allan
Revision: 30614

upgpkg: bzip2 1.0.5-4
    Use our CFLAGS (FS#13415), rework PKGBUILD

Modified:
  bzip2/trunk/PKGBUILD

----------+
 PKGBUILD |   64 ++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-21 02:03:53 UTC (rev 30613)
+++ PKGBUILD	2009-03-21 02:13:23 UTC (rev 30614)
@@ -3,45 +3,53 @@
 
 pkgname=bzip2
 pkgver=1.0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-quality data compression program"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://sources.redhat.com/bzip2"
 groups=('base')
 depends=('glibc')
 source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz)
+md5sums=('3c15a0c8d1d3ee1c46a1634d00617b1a')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  mkdir -p $startdir/pkg/bin $startdir/pkg/usr/share/man/man1
-  mkdir -p $startdir/pkg/usr/include $startdir/pkg/usr/lib
-  mkdir -p $startdir/pkg/lib
+  cd $srcdir/$pkgname-$pkgver
+  
   # add large-file support
   sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so
+  
+  # use our optimization
+  sed -i "s|-O2|${CFLAGS}|g" Makefile
+  sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so
+  
   make -f Makefile-libbz2_so || return 1
   make bzip2recover libbz2.a || return 1
-  ln -s libbz2.so.1.0.4 libbz2.so
-  ln -s libbz2.so.1.0.4 libbz2.so.1
-  cp bzip2-shared $startdir/pkg/bin/bzip2
-  cp bzip2recover $startdir/pkg/bin
-  cp bzip2.1 $startdir/pkg/usr/share/man/man1
-  mkdir -p $startdir/pkg/usr/include
-  cp bzlib.h $startdir/pkg/usr/include
-  cp -a libbz2.so* $startdir/pkg/lib
-  rm -f $startdir/pkg/usr/lib/libbz2.a
-  cp libbz2.a $startdir/pkg/usr/lib
-  cd $startdir/pkg/usr/lib
-  ln -sf ../../lib/libbz2.so
-  cd $startdir/pkg/bin
-  ln -sf bzip2 bunzip2
-  ln -sf bzip2 bzcat
-  cd $startdir/pkg/usr/share/man/man1
-  ln -sf bzip2.1 bunzip2.1
-  ln -sf bzip2.1 bzcat.1
-  ln -sf bzip2.1 bzip2recover.1
 
-  mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
-  install -m644 ${startdir}/src/${pkgname}-${pkgver}/LICENSE ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE
+  install -dm755 $pkgdir/bin
+  install -m755 bzip2-shared $pkgdir/bin/bzip2
+  install -m755 bzip2recover $pkgdir/bin
+  ln -sf bzip2 $pkgdir/bin/bunzip2
+  ln -sf bzip2 $pkgdir/bin/bzcat
+
+  install -Dm755 libbz2.so.1.0.4 $pkgdir/lib/libbz2.so.1.0.4
+
+  install -Dm755 libbz2.so.1.0.4 $pkgdir/lib/libbz2.so.1.0.4
+  ln -s libbz2.so.1.0.4 $pkgdir/lib/libbz2.so
+  ln -s libbz2.so.1.0.4 $pkgdir/lib/libbz2.so.1
+  ln -s libbz2.so.1.0.4 $pkgdir/lib/libbz2.so.1.0
+  
+  install -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
+  ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so
+
+  install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h  
+
+  install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1
+  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1
+  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1
+  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1
+
+  install -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \
+                 $pkgdir/usr/share/licenses/${pkgname}/LICENSE
 }
-md5sums=('3c15a0c8d1d3ee1c46a1634d00617b1a')
+