Update for bzip2 package to version 0.9.0b created by Geoff C. Wing.

4 files changed, 47 insertions, 11 deletions

diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index 3b077c526bd..02a34704d22 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -1,25 +1,29 @@
-# $NetBSD: Makefile,v 1.8 1998/09/16 17:47:04 tron Exp $
+# $NetBSD: Makefile,v 1.9 1998/10/14 21:51:14 tron Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/11/20 08:18:40 tg Exp
 #
 
-DISTNAME=	bzip2-0.1pl2
-PKGNAME=	bzip2-0.1p2
+DISTNAME=	bzip2-0.9.0b
 CATEGORIES=	archivers
-MASTER_SITES=	http://www.muraroa.demon.co.uk/
+MASTER_SITES=	http://www.muraroa.demon.co.uk/ \
+		http://www.digistar.com/bzip2/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.muraroa.demon.co.uk/
 
+CONFLICTS=	bzip2-0.1p2
+
 .if exists(/usr/bin/bzip2)
 IGNORE=		"is part of your NetBSD distribution"
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bzip2 ${PREFIX}/bin
-	ln -sf ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bunzip2
+	ln -f ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bunzip2
+	ln -f ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bzcat
 	${INSTALL_PROGRAM} ${WRKSRC}/bzip2recover ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/bzip2.1 ${PREFIX}/man/man1
 	ln -sf ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bunzip2.1
+	ln -sf ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bzcat.1
 	ln -sf ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bzip2recover.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/bzip2/files/md5 b/archivers/bzip2/files/md5
index 2287bb57f48..5155e7358a0 100644
--- a/archivers/bzip2/files/md5
+++ b/archivers/bzip2/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:16:50 agc Exp $
+$NetBSD: md5,v 1.4 1998/10/14 21:51:14 tron Exp $
 
-MD5 (bzip2-0.1pl2.tar.gz) = 11fe7b9615eb84326712cb41671a7103
+MD5 (bzip2-0.9.0b.tar.gz) = 74f425b051e296106dbc879afb241f1d
diff --git a/archivers/bzip2/patches/patch-aa b/archivers/bzip2/patches/patch-aa
new file mode 100644
index 00000000000..46e20e8a908
--- /dev/null
+++ b/archivers/bzip2/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.1 1998/10/14 21:51:14 tron Exp $
+
+--- Makefile.orig	Wed Sep  9 13:30:41 1998
++++ Makefile	Wed Oct 14 23:36:32 1998
+@@ -14,12 +14,13 @@
+ 
+ bzip2: lib
+ 	$(CC) $(CFLAGS) -c bzip2.c
+-	$(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2
+-	$(CC) $(CFLAGS) -o bzip2recover bzip2recover.c
++	$(CC) $(CFLAGS) -static -o bzip2 bzip2.o -L. -lbz2
++	$(CC) $(CFLAGS) -static -o bzip2recover bzip2recover.c
+ 
+ lib: $(OBJS)
+ 	rm -f libbz2.a
+ 	ar clq libbz2.a $(OBJS)
++	ranlib libbz2.a
+ 
+ test: bzip2
+ 	@cat words1
+@@ -37,9 +38,6 @@
+ 
+ clean: 
+ 	rm -f *.o libbz2.a bzip2 bzip2recover sample1.rb2 sample2.rb2 sample1.tst sample2.tst
+-
+-.c.o: $*.o bzlib.h bzlib_private.h
+-	$(CC) $(CFLAGS) -c $*.c -o $*.o
+ 
+ tarfile:
+ 	tar cvf interim.tar *.c *.h Makefile manual.texi manual.ps LICENSE bzip2.1 bzip2.1.preformatted bzip2.txt words1 words2 words3 sample1.ref sample2.ref sample1.bz2 sample2.bz2 *.html README libbz2.def libbz2.dsp dlltest.dsp 
diff --git a/archivers/bzip2/pkg/PLIST b/archivers/bzip2/pkg/PLIST
index dcec55da1ad..e258baa5fa9 100644
--- a/archivers/bzip2/pkg/PLIST
+++ b/archivers/bzip2/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 1998/06/18 15:51:29 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/10/14 21:51:15 tron Exp $
 bin/bzip2
 bin/bunzip2
+bin/bzcat
 bin/bzip2recover
-man/man1/bzip2.1.gz
-man/man1/bunzip2.1.gz
-man/man1/bzip2recover.1.gz
+man/man1/bzip2.1
+man/man1/bunzip2.1
+man/man1/bzcat.1
+man/man1/bzip2recover.1