From 5317bf60bc813a82a153c513fa33971729deb3b7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 19 Feb 2011 23:21:03 +0100 Subject: [PATCH] bzip2: enable large files support, change install dirs (from Arch). --- srcpkgs/bzip2/bzip2-devel.template | 2 + .../bzip2/patches/Makefile_fix_install.diff | 69 ------------------- srcpkgs/bzip2/template | 48 ++++++++++--- 3 files changed, 41 insertions(+), 78 deletions(-) delete mode 100644 srcpkgs/bzip2/patches/Makefile_fix_install.diff diff --git a/srcpkgs/bzip2/bzip2-devel.template b/srcpkgs/bzip2/bzip2-devel.template index 3c4f338c917..946fec8ffda 100644 --- a/srcpkgs/bzip2/bzip2-devel.template +++ b/srcpkgs/bzip2/bzip2-devel.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +revision=1 + Add_dependency run glibc-devel Add_dependency run bzip2 diff --git a/srcpkgs/bzip2/patches/Makefile_fix_install.diff b/srcpkgs/bzip2/patches/Makefile_fix_install.diff deleted file mode 100644 index e85768e9df3..00000000000 --- a/srcpkgs/bzip2/patches/Makefile_fix_install.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- Makefile.orig 2008-02-14 13:39:18.000000000 +0100 -+++ Makefile 2009-02-18 02:31:13.000000000 +0100 -@@ -25,7 +25,7 @@ CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) - - # Where you want it installed when you do 'make install' - PREFIX=/usr/local -- -+MANDIR=$(PREFIX)/share/man - - OBJS= blocksort.o \ - huffman.o \ -@@ -72,8 +72,8 @@ test: bzip2 - install: bzip2 bzip2recover - if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi - if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi -- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi -- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi -+ if ( test ! -d $(MANDIR) ) ; then mkdir -p $(MANDIR) ; fi -+ if ( test ! -d $(MANDIR)/man1 ) ; then mkdir -p $(MANDIR)/man1 ; fi - if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi - cp -f bzip2 $(PREFIX)/bin/bzip2 - cp -f bzip2 $(PREFIX)/bin/bunzip2 -@@ -83,31 +83,30 @@ install: bzip2 bzip2recover - chmod a+x $(PREFIX)/bin/bunzip2 - chmod a+x $(PREFIX)/bin/bzcat - chmod a+x $(PREFIX)/bin/bzip2recover -- cp -f bzip2.1 $(PREFIX)/man/man1 -- chmod a+r $(PREFIX)/man/man1/bzip2.1 -+ cp -f bzip2.1 $(MANDIR)/man1 -+ chmod a+r $(MANDIR)/man1/bzip2.1 - cp -f bzlib.h $(PREFIX)/include - chmod a+r $(PREFIX)/include/bzlib.h - cp -f libbz2.a $(PREFIX)/lib -- chmod a+r $(PREFIX)/lib/libbz2.a -+ cp -a libbz2.so* $(PREFIX)/lib -+ #chmod a+r $(PREFIX)/lib/libbz2.* - cp -f bzgrep $(PREFIX)/bin/bzgrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep -+ cd $(PREFIX)/bin && ln -s bzgrep bzegrep && ln -s bzgrep bzfgrep - chmod a+x $(PREFIX)/bin/bzgrep - cp -f bzmore $(PREFIX)/bin/bzmore -- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless -+ cd $(PREFIX)/bin && ln -s bzmore bzless - chmod a+x $(PREFIX)/bin/bzmore - cp -f bzdiff $(PREFIX)/bin/bzdiff -- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp -+ cd $(PREFIX)/bin && ln -s bzdiff bzcmp - chmod a+x $(PREFIX)/bin/bzdiff -- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 -- chmod a+r $(PREFIX)/man/man1/bzgrep.1 -- chmod a+r $(PREFIX)/man/man1/bzmore.1 -- chmod a+r $(PREFIX)/man/man1/bzdiff.1 -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1 -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 -- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 -- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 -- -+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(MANDIR)/man1 -+ chmod a+r $(MANDIR)/man1/bzgrep.1 -+ chmod a+r $(MANDIR)/man1/bzmore.1 -+ chmod a+r $(MANDIR)/man1/bzdiff.1 -+ echo ".so man1/bzgrep.1" > $(MANDIR)/man1/bzegrep.1 -+ echo ".so man1/bzgrep.1" > $(MANDIR)/man1/bzfgrep.1 -+ echo ".so man1/bzmore.1" > $(MANDIR)/man1/bzless.1 -+ echo ".so man1/bzdiff.1" > $(MANDIR)/man1/bzcmp.1 - clean: - rm -f *.o libbz2.a bzip2 bzip2recover \ - sample1.rb2 sample2.rb2 sample3.rb2 \ diff --git a/srcpkgs/bzip2/template b/srcpkgs/bzip2/template index f21b2ed1641..1378416461f 100644 --- a/srcpkgs/bzip2/template +++ b/srcpkgs/bzip2/template @@ -1,10 +1,9 @@ # Template build file for 'bzip2'. pkgname=bzip2 version=1.0.6 +revision=1 distfiles="http://www.bzip.org/$version/$pkgname-$version.tar.gz" -build_style=gnu_makefile -make_build_target="-f Makefile-libbz2_so" -make_install_args="PREFIX=$XBPS_DESTDIR/$pkgname-$version/usr" +build_style=custom-install short_desc="The bzip2 compression library" maintainer="Juan RP " checksum=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd @@ -27,11 +26,42 @@ base_chroot=yes subpackages="bzip2-devel" Add_dependency run glibc -pre_build() +do_build() { - # Do not overwrite CC! - for f in Makefile Makefile-libbz2_so; do - sed -i -e "s|\(CC\)\(=gcc\)|\1?\2|g" \ - ${wrksrc}/${f} || return 1 - done + # 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 ${makejobs} -f Makefile-libbz2_so + make ${makejobs} bzip2recover libbz2.a +} + +do_install() +{ + install -dm755 ${DESTDIR}/bin + install -m755 bzip2-shared ${DESTDIR}/bin/bzip2 + install -m755 bzip2recover ${DESTDIR}/bin + ln -sf bzip2 ${DESTDIR}/bin/bunzip2 + ln -sf bzip2 ${DESTDIR}/bin/bzcat + + install -dm755 ${DESTDIR}/usr/bin + install -m755 bzdiff bzgrep bzmore ${DESTDIR}/usr/bin + + install -Dm755 libbz2.so.${version} ${DESTDIR}/lib/libbz2.so.${version} + ln -s libbz2.so.${version} ${DESTDIR}/lib/libbz2.so + ln -s libbz2.so.${version} ${DESTDIR}/lib/libbz2.so.1 + ln -s libbz2.so.${version} ${DESTDIR}/lib/libbz2.so.1.0 + + install -Dm644 libbz2.a ${DESTDIR}/usr/lib/libbz2.a + ln -sf ../../lib/libbz2.so ${DESTDIR}/usr/lib/libbz2.so + + install -Dm644 bzlib.h ${DESTDIR}/usr/include/bzlib.h + + install -Dm644 bzip2.1 ${DESTDIR}/usr/share/man/man1/bzip2.1 + ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bunzip2.1 + ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzcat.1 + ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzip2recover.1 }