upgrade to bzip2 1.0.1

- add HOMEPAGE - switch to libtool for shared library creation - use better filename for patch
2000-06-25 03:56:58 +00:00 · 2000-06-25 03:56:58 +00:00 · eb70f907e9
commit eb70f907e9
parent 0a878b8131
7 changed files with 173 additions and 130 deletions
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.25 2000/06/10 18:51:44 brad Exp $
+# $OpenBSD: Makefile,v 1.26 2000/06/25 03:56:58 brad Exp $

-DISTNAME=	bzip2-1.0.0
+DISTNAME=	bzip2-1.0.1
 CATEGORIES=	archivers
 NEED_VERSION=	1.301
 MASTER_SITES=	ftp://sourceware.cygnus.com/pub/bzip2/v100/ \
 		ftp://ftp.yggdrasil.com/mirrors/site/sourceware.cygnus.com/pub/bzip2/v100/

+HOMEPAGE=	http://sourceware.cygnus.com/bzip2/
+
 MAINTAINER=	angelos@openbsd.org

 PERMIT_PACKAGE_CDROM=	Yes
@ -13,17 +15,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MAKE_FLAGS=	CC="${CC}" \
+USE_LIBTOOL=	Yes
+MAKE_FLAGS=	PREFIX="${PREFIX}" CC="${CC}" \
 		CFLAGS="${CFLAGS} -Wall -Winline -fomit-frame-pointer \
 		-fno-strength-reduce"
-
-FAKE_FLAGS=	PREFIX="${WRKINST}${PREFIX}"
+FAKE_FLAGS=	PREFIX="${PREFIX}" DESTDIR="${WRKINST}"

 test:   build
-	@cd ${WRKSRC} && env LD_LIBRARY_PATH="${WRKSRC}" make test
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} -f ${MAKE_FILE} test

 .include <bsd.port.mk>
-
-.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
-MAKE_ENV=	NO_SHARED_LIBS=	Yes
-.endif
--- a/archivers/bzip2/files/md5
+++ b/archivers/bzip2/files/md5
@ -1,3 +1,3 @@
-MD5 (bzip2-1.0.0.tar.gz) = bb09685f8db0e8e588e29ecefb5a9851
-RMD160 (bzip2-1.0.0.tar.gz) = e9c8a541e2cbd73a6148bf2ca996b62452d05350
-SHA1 (bzip2-1.0.0.tar.gz) = 4cfc96367b0a590ac425c625acb0b514ffabd1c0
+MD5 (bzip2-1.0.1.tar.gz) = 770135dc94369cb3eb6013ed505c8dc5
+RMD160 (bzip2-1.0.1.tar.gz) = 76ea44a088db5322d7ee21c21c042e74f91fcc67
+SHA1 (bzip2-1.0.1.tar.gz) = 0a5a71eded51be0c15d9532b44060f61b564d4f5
--- a/archivers/bzip2/patches/patch-Makefile
+++ b/archivers/bzip2/patches/patch-Makefile
@ -0,0 +1,157 @@
+--- Makefile.orig	Fri Jun 23 16:34:47 2000
+++ Makefile	Sat Jun 24 23:29:25 2000
+@@ -4,94 +4,83 @@
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+ CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
+ 
+-OBJS= blocksort.o  \
+-      huffman.o    \
+-      crctable.o   \
+-      randtable.o  \
+-      compress.o   \
+-      decompress.o \
+-      bzlib.o
+OBJS= blocksort.lo  \
+      huffman.lo    \
+      crctable.lo   \
+      randtable.lo  \
+      compress.lo   \
+      decompress.lo \
+      bzlib.lo
+ 
+-all: libbz2.a bzip2 bzip2recover test
+all: libbz2.a bzip2 bzip2recover
+ 
+-bzip2: libbz2.a bzip2.o
+-	$(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2
+bzip2: libbz2.a bzip2.lo
+	libtool --mode=link $(CC) $(CFLAGS) -o bzip2 bzip2.lo libbz2.la
+ 
+-bzip2recover: bzip2recover.o
+-	$(CC) $(CFLAGS) -o bzip2recover bzip2recover.o
+bzip2recover: bzip2recover.lo
+	libtool --mode=link $(CC) $(CFLAGS) -o bzip2recover bzip2recover.lo
+ 
+ libbz2.a: $(OBJS)
+-	rm -f libbz2.a
+-	ar cq libbz2.a $(OBJS)
+-	@if ( test -f /usr/bin/ranlib -o -f /bin/ranlib -o \
+-		-f /usr/ccs/bin/ranlib ) ; then \
+-		echo ranlib libbz2.a ; \
+-		ranlib libbz2.a ; \
+-	fi
+	libtool --mode=link $(CC) $(CFLAGS) -o libbz2.la $(OBJS) \
+	 -version-info 10:1:0 -rpath $(PREFIX)/lib
+ 
+ test: bzip2
+-	@cat words1
+-	./bzip2 -1  < sample1.ref > sample1.rb2
+-	./bzip2 -2  < sample2.ref > sample2.rb2
+-	./bzip2 -3  < sample3.ref > sample3.rb2
+-	./bzip2 -d  < sample1.bz2 > sample1.tst
+-	./bzip2 -d  < sample2.bz2 > sample2.tst
+-	./bzip2 -ds < sample3.bz2 > sample3.tst
+-	cmp sample1.bz2 sample1.rb2 
+-	cmp sample2.bz2 sample2.rb2
+-	cmp sample3.bz2 sample3.rb2
+-	cmp sample1.tst sample1.ref
+-	cmp sample2.tst sample2.ref
+-	cmp sample3.tst sample3.ref
+-	@cat words3
+	./bzip2 -1  < sample1.ref > sample1.rb2 || exit 1
+	./bzip2 -2  < sample2.ref > sample2.rb2 || exit 1
+	./bzip2 -3  < sample3.ref > sample3.rb2 || exit 1
+	./bzip2 -d  < sample1.bz2 > sample1.tst || exit 1
+	./bzip2 -d  < sample2.bz2 > sample2.tst || exit 1
+	./bzip2 -ds < sample3.bz2 > sample3.tst || exit 1
+	cmp sample1.bz2 sample1.rb2 || exit 1
+	cmp sample2.bz2 sample2.rb2 || exit 1
+	cmp sample3.bz2 sample3.rb2 || exit 1
+	cmp sample1.tst sample1.ref || exit 1
+	cmp sample2.tst sample2.ref || exit 1
+	cmp sample3.tst sample3.ref || exit 1
+ 
+ PREFIX=/usr
+ 
+ install: bzip2 bzip2recover
+-	if ( test ! -d $(PREFIX)/bin ) ; then mkdir $(PREFIX)/bin ; fi
+-	if ( test ! -d $(PREFIX)/lib ) ; then mkdir $(PREFIX)/lib ; fi
+-	if ( test ! -d $(PREFIX)/man ) ; then mkdir $(PREFIX)/man ; fi
+-	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir $(PREFIX)/man/man1 ; fi
+-	if ( test ! -d $(PREFIX)/include ) ; then mkdir $(PREFIX)/include ; fi
+-	cp -f bzip2 $(PREFIX)/bin/bzip2
+-	cp -f bzip2 $(PREFIX)/bin/bunzip2
+-	cp -f bzip2 $(PREFIX)/bin/bzcat
+-	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
+-	chmod a+x $(PREFIX)/bin/bzip2
+-	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 bzlib.h $(PREFIX)/include
+-	chmod a+r $(PREFIX)/include/bzlib.h
+-	cp -f libbz2.a $(PREFIX)/lib
+-	chmod a+r $(PREFIX)/lib/libbz2.a
+	if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(PREFIX)/bin ; fi
+	if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/lib ; fi
+	if ( test ! -d $(DESTDIR)$(PREFIX)/man ) ; then $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(PREFIX)/man ; fi
+	if ( test ! -d $(DESTDIR)$(PREFIX)/man/man1 ) ; then $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(PREFIX)/man/man1 ; fi
+	if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/include ; fi
+	libtool --mode=install $(BSD_INSTALL_PROGRAM) bzip2 $(DESTDIR)$(PREFIX)/bin
+	@cd $(DESTDIR)$(PREFIX)/bin; ln -fs bzip2 bunzip2; \
+			ln -fs bzip2 bzcat
+	libtool --mode=install $(BSD_INSTALL_PROGRAM) bzip2recover $(DESTDIR)$(PREFIX)/bin
+	$(BSD_INSTALL_MAN) bzip2.1 $(DESTDIR)$(PREFIX)/man/man1
+	$(BSD_INSTALL_MAN) bzip2.1 $(DESTDIR)$(PREFIX)/man/man1/bunzip2.1
+	$(BSD_INSTALL_MAN) bzip2.1 $(DESTDIR)$(PREFIX)/man/man1/bzcat.1
+	$(BSD_INSTALL_MAN) bzip2.1 $(DESTDIR)$(PREFIX)/man/man1/bzip2recover.1
+	$(BSD_INSTALL_DATA) bzlib.h $(DESTDIR)$(PREFIX)/include
+	libtool --mode=install $(BSD_INSTALL_DATA) libbz2.la $(DESTDIR)$(PREFIX)/lib
+ 
+ clean: 
+-	rm -f *.o libbz2.a bzip2 bzip2recover \
+	rm -f *.o *.lo libbz2.a bzip2 bzip2recover \
+ 	sample1.rb2 sample2.rb2 sample3.rb2 \
+ 	sample1.tst sample2.tst sample3.tst
+ 
+-blocksort.o: blocksort.c
+blocksort.lo: blocksort.c
+ 	@cat words0
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
+-bzip2.o: bzip2.c
+-	$(CC) $(CFLAGS) -c bzip2.c
+-bzip2recover.o: bzip2recover.c
+-	$(CC) $(CFLAGS) -c bzip2recover.c
+	libtool --mode=compile $(CC) $(CFLAGS) -c blocksort.c
+huffman.lo: huffman.c
+	libtool --mode=compile $(CC) $(CFLAGS) -c huffman.c
+crctable.lo: crctable.c
+	libtool --mode=compile $(CC) $(CFLAGS) -c crctable.c
+randtable.lo: randtable.c
+	libtool --mode=compile $(CC) $(CFLAGS) -c randtable.c
+compress.lo: compress.c
+	libtool --mode=compile $(CC) $(CFLAGS) -c compress.c
+decompress.lo: decompress.c
+	libtool --mode=compile $(CC) $(CFLAGS) -c decompress.c
+bzlib.lo: bzlib.c
+	libtool --mode=compile $(CC) $(CFLAGS) -c bzlib.c
+bzip2.lo: bzip2.c
+	libtool --mode=compile $(CC) $(CFLAGS) -c bzip2.c
+bzip2recover.lo: bzip2recover.c
+	libtool --mode=compile $(CC) $(CFLAGS) -c bzip2recover.c
+ 
+ DISTNAME=bzip2-1.0.1
+ tarfile:
--- a/archivers/bzip2/patches/patch-aa
+++ b/archivers/bzip2/patches/patch-aa
@ -1,113 +0,0 @@
--- Makefile.orig	Tue May 16 17:31:04 2000
-+++ Makefile	Mon Jun 12 10:58:00 2000
-@@ -12,7 +12,15 @@
-       decompress.o \
-       bzlib.o
- 
-all: libbz2.a bzip2 bzip2recover test
-+.SUFFIXES: .c .o .so
-+
-+VERSION=10.0
-+
-+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
-+all: libbz2.a bzip2 bzip2recover
-+.else
-+all: libbz2.a libbz2.so.${VERSION} bzip2 bzip2recover
-+.endif
- 
- bzip2: libbz2.a bzip2.o
- 	$(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2
-@@ -29,47 +37,48 @@
- 		ranlib libbz2.a ; \
- 	fi
- 
-+libbz2.so.${VERSION}: $(OBJS:S/o$/so/g)
-+	rm -f libbz2.so.${VERSION}
-+	ld -Bshareable -Bforcearchive -o libbz2.so.${VERSION} $(OBJS:S/o$/so/g)
-+
- test: bzip2
-	@cat words1
-	./bzip2 -1  < sample1.ref > sample1.rb2
-	./bzip2 -2  < sample2.ref > sample2.rb2
-	./bzip2 -3  < sample3.ref > sample3.rb2
-	./bzip2 -d  < sample1.bz2 > sample1.tst
-	./bzip2 -d  < sample2.bz2 > sample2.tst
-	./bzip2 -ds < sample3.bz2 > sample3.tst
-	cmp sample1.bz2 sample1.rb2 
-	cmp sample2.bz2 sample2.rb2
-	cmp sample3.bz2 sample3.rb2
-	cmp sample1.tst sample1.ref
-	cmp sample2.tst sample2.ref
-	cmp sample3.tst sample3.ref
-	@cat words3
-+	./bzip2 -1  < sample1.ref > sample1.rb2 || exit 1
-+	./bzip2 -2  < sample2.ref > sample2.rb2 || exit 1
-+	./bzip2 -3  < sample3.ref > sample3.rb2 || exit 1
-+	./bzip2 -d  < sample1.bz2 > sample1.tst || exit 1
-+	./bzip2 -d  < sample2.bz2 > sample2.tst || exit 1
-+	./bzip2 -ds < sample3.bz2 > sample3.tst || exit 1
-+	cmp sample1.bz2 sample1.rb2 || exit 1
-+	cmp sample2.bz2 sample2.rb2 || exit 1
-+	cmp sample3.bz2 sample3.rb2 || exit 1
-+	cmp sample1.tst sample1.ref || exit 1
-+	cmp sample2.tst sample2.ref || exit 1
-+	cmp sample3.tst sample3.ref || exit 1
- 
- PREFIX=/usr
- 
- install: bzip2 bzip2recover
-	if ( test ! -d $(PREFIX)/bin ) ; then mkdir $(PREFIX)/bin ; fi
-	if ( test ! -d $(PREFIX)/lib ) ; then mkdir $(PREFIX)/lib ; fi
-	if ( test ! -d $(PREFIX)/man ) ; then mkdir $(PREFIX)/man ; fi
-	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir $(PREFIX)/man/man1 ; fi
-	if ( test ! -d $(PREFIX)/include ) ; then mkdir $(PREFIX)/include ; fi
-	cp -f bzip2 $(PREFIX)/bin/bzip2
-	cp -f bzip2 $(PREFIX)/bin/bunzip2
-	cp -f bzip2 $(PREFIX)/bin/bzcat
-	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
-	chmod a+x $(PREFIX)/bin/bzip2
-	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 bzlib.h $(PREFIX)/include
-	chmod a+r $(PREFIX)/include/bzlib.h
-	cp -f libbz2.a $(PREFIX)/lib
-	chmod a+r $(PREFIX)/lib/libbz2.a
-+	if ( test ! -d $(PREFIX)/bin ) ; then $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin ; fi
-+	if ( test ! -d $(PREFIX)/lib ) ; then $(BSD_INSTALL_DATA_DIR) $(PREFIX)/lib ; fi
-+	if ( test ! -d $(PREFIX)/man ) ; then $(BSD_INSTALL_MAN_DIR) $(PREFIX)/man ; fi
-+	if ( test ! -d $(PREFIX)/man/man1 ) ; then $(BSD_INSTALL_MAN_DIR) $(PREFIX)/man/man1 ; fi
-+	if ( test ! -d $(PREFIX)/include ) ; then $(BSD_INSTALL_DATA_DIR) $(PREFIX)/include ; fi
-+	$(BSD_INSTALL_PROGRAM) bzip2 $(PREFIX)/bin
-+	@cd $(PREFIX)/bin; ln -fs bzip2 bunzip2; \
-+			ln -fs bzip2 bzcat
-+	$(BSD_INSTALL_PROGRAM) bzip2recover $(PREFIX)/bin
-+	$(BSD_INSTALL_MAN) bzip2.1 $(PREFIX)/man/man1
-+	$(BSD_INSTALL_MAN) bzip2.1 $(PREFIX)/man/man1/bunzip2.1
-+	$(BSD_INSTALL_MAN) bzip2.1 $(PREFIX)/man/man1/bzcat.1
-+	$(BSD_INSTALL_MAN) bzip2.1 $(PREFIX)/man/man1/bzip2recover.1
-+	$(BSD_INSTALL_DATA) bzlib.h $(PREFIX)/include
-+	$(BSD_INSTALL_DATA) libbz2.a $(PREFIX)/lib
-+	@if [ -f libbz2.so.${VERSION} ]; then \
-+	 $(BSD_INSTALL_DATA) libbz2.so.${VERSION} $(PREFIX)/lib ;\
-+	fi
- 
- clean: 
-	rm -f *.o libbz2.a bzip2 bzip2recover \
-+	rm -f *.o *.so libbz2.a libbz2.so.${VERSION} bzip2 bzip2recover \
- 	sample1.rb2 sample2.rb2 sample3.rb2 \
- 	sample1.tst sample2.tst sample3.tst
- 
-@@ -92,6 +101,10 @@
- 	$(CC) $(CFLAGS) -c bzip2.c
- bzip2recover.o: bzip2recover.c
- 	$(CC) $(CFLAGS) -c bzip2recover.c
-+.c.o:
-+	$(CC) $(CFLAGS) -c $*.c -o $*.o
-+.c.so:
-+	$(CC) $(CFLAGS) -fpic -DPIC -c $*.c -o $*.so
- 
- DISTNAME=bzip2-1.0.0
- tarfile:
--- a/archivers/bzip2/pkg/DESCR
+++ b/archivers/bzip2/pkg/DESCR
@ -7,4 +7,4 @@ From the README:
   carry out a full patent search.  Therefore I cannot give any
   guarantee of the above statement.

-   Julian Seward <jseward@acm.org>
+WWW: ${HOMEPAGE}
--- a/archivers/bzip2/pkg/PFRAG.shared
+++ b/archivers/bzip2/pkg/PFRAG.shared
@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1 2000/06/10 18:51:44 brad Exp $
-lib/libbz2.so.10.0
+@comment $OpenBSD: PFRAG.shared,v 1.2 2000/06/25 03:56:58 brad Exp $
+lib/libbz2.so.10.1
@exec /sbin/ldconfig -m %B
--- a/archivers/bzip2/pkg/PLIST
+++ b/archivers/bzip2/pkg/PLIST
@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.9 2000/06/10 18:51:44 brad Exp $
+@comment $OpenBSD: PLIST,v 1.10 2000/06/25 03:56:58 brad Exp $
 bin/bunzip2
 bin/bzcat
 bin/bzip2
 bin/bzip2recover
 include/bzlib.h
 lib/libbz2.a
+lib/libbz2.la
 %%SHARED%%
 man/man1/bunzip2.1
 man/man1/bzcat.1