summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1999-08-06 18:45:49 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1999-08-06 18:45:49 +0000
commit4de5ef207008f73ec313e3fedec1cc2c64717581 (patch)
tree72fe16f401848eab619e0f9d74b1892f73091c03 /archivers
parentUpgrade to 16.15. (diff)
Revert back to version 0.9.0c. John Milford <jwm@CSUA.Berkeley.EDU> found
that /usr/ports/textproc/dsssl-docbook-modular/pkg/PLIST cannot be decompressed with any version of bzip2 if compressed by version 0.9.5b. Bzip2 author has been notified. Submitted by: John Milford <jwm@CSUA.Berkeley.EDU>
Notes
Notes: svn path=/head/; revision=20564
Diffstat (limited to 'archivers')
-rw-r--r--archivers/bzip2/Makefile11
-rw-r--r--archivers/bzip2/distinfo2
-rw-r--r--archivers/bzip2/files/patch-aa26
-rw-r--r--archivers/bzip2/pkg-plist2
4 files changed, 28 insertions, 13 deletions
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index 2a67235e4b1c..daf25ac4f72c 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -4,14 +4,14 @@
# Date created: 19 Nov 1997
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.12 1999/08/01 03:11:07 obrien Exp $
+# $Id: Makefile,v 1.10 1999/04/19 22:28:11 obrien Exp $
#
-DISTNAME= bzip2-0.9.5b
+DISTNAME= bzip2-0.9.0c
CATEGORIES= archivers
-MASTER_SITES= http://www.bzip2.org/bzip2/v095/ \
- http://www.digistar.com/bzip2/ \
- http://www.muraroa.demon.co.uk/
+MASTER_SITES= http://www.muraroa.demon.co.uk/ \
+ http://www.bzip2.org/bzip2/v090/ \
+ http://www.digistar.com/bzip2/
MAINTAINER= obrien@FreeBSD.org
@@ -30,7 +30,6 @@ do-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/bzip2
${INSTALL_DATA} ${WRKSRC}/manual* ${PREFIX}/share/doc/bzip2
- ${PREFIX}/bin/bzip2 ${PREFIX}/share/doc/bzip2/manual.ps
.endif
.include <bsd.port.mk>
diff --git a/archivers/bzip2/distinfo b/archivers/bzip2/distinfo
index 05158c1bcb56..0cab4550a584 100644
--- a/archivers/bzip2/distinfo
+++ b/archivers/bzip2/distinfo
@@ -1 +1 @@
-MD5 (bzip2-0.9.5b.tar.gz) = 4f00eb4429452932b1689c53a4621d49
+MD5 (bzip2-0.9.0c.tar.gz) = 29993af5282e817fafc5a76b4e0c98fa
diff --git a/archivers/bzip2/files/patch-aa b/archivers/bzip2/files/patch-aa
index 916a596308a7..fed6f64b57a4 100644
--- a/archivers/bzip2/files/patch-aa
+++ b/archivers/bzip2/files/patch-aa
@@ -1,13 +1,29 @@
---- Makefile.orig Tue Jul 6 15:38:07 1999
-+++ Makefile Sat Jul 31 19:48:44 1999
-@@ -1,7 +1,8 @@
+--- Makefile.orig Fri Oct 23 04:57:22 1998
++++ Makefile Wed Mar 24 00:19:11 1999
+@@ -1,6 +1,7 @@
- SHELL=/bin/sh
-CC=gcc
--CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce
+-CFLAGS=-Wall -O2 -fomit-frame-pointer -fno-strength-reduce
+CC?=gcc
+CFLAGS?=-O2
+CFLAGS+=-Wall -fomit-frame-pointer -fno-strength-reduce
OBJS= blocksort.o \
huffman.o \
+@@ -20,6 +21,7 @@
+ lib: $(OBJS)
+ rm -f libbz2.a
+ ar clq libbz2.a $(OBJS)
++ ranlib libbz2.a
+
+ test: bzip2
+ @cat words1
+@@ -38,7 +40,7 @@
+ clean:
+ rm -f *.o libbz2.a bzip2 bzip2recover sample1.rb2 sample2.rb2 sample1.tst sample2.tst
+
+-.c.o: $*.o bzlib.h bzlib_private.h
++.c.o: bzlib.h bzlib_private.h
+ $(CC) $(CFLAGS) -c $*.c -o $*.o
+
+ tarfile:
diff --git a/archivers/bzip2/pkg-plist b/archivers/bzip2/pkg-plist
index 59ac48d9ac0b..a53973fe3b9a 100644
--- a/archivers/bzip2/pkg-plist
+++ b/archivers/bzip2/pkg-plist
@@ -4,7 +4,7 @@ bin/bzcat
bin/bzip2recover
include/bzlib.h
lib/libbz2.a
-share/doc/bzip2/manual.ps.bz2
+share/doc/bzip2/manual.ps
share/doc/bzip2/manual.texi
share/doc/bzip2/manual_1.html
share/doc/bzip2/manual_2.html