summaryrefslogtreecommitdiff
path: root/archivers/bzip2
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-06-10 01:14:58 +0000
committerwiz <wiz@pkgsrc.org>2001-06-10 01:14:58 +0000
commit9edb8eb8d1069655d8a82c16fdbd411906519764 (patch)
treee5b5cb772175264c0870c4d52090b11213685efb /archivers/bzip2
parent5d02f04b3aa2a8553bbc5c5b42fc941c54d5c76d (diff)
downloadpkgsrc-9edb8eb8d1069655d8a82c16fdbd411906519764.tar.gz
Update to 1.0.1.
Diffstat (limited to 'archivers/bzip2')
-rw-r--r--archivers/bzip2/Makefile14
-rw-r--r--archivers/bzip2/distinfo9
-rw-r--r--archivers/bzip2/patches/patch-aa35
3 files changed, 19 insertions, 39 deletions
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index cc429189d5e..8d29c916493 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -1,20 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2001/02/16 13:15:25 wiz Exp $
-# FreeBSD Id: Makefile,v 1.1.1.1 1997/11/20 08:18:40 tg Exp
+# $NetBSD: Makefile,v 1.16 2001/06/10 01:14:58 wiz Exp $
#
-DISTNAME= bzip2-0.9.0b
+DISTNAME= bzip2-1.0.1
CATEGORIES= archivers
-MASTER_SITES= http://www.muraroa.demon.co.uk/ \
- http://www.digistar.com/bzip2/
+MASTER_SITES= ftp://sourceware.cygnus.com/pub/bzip2/v100/
MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://sourceware.cygnus.com/bzip2/index.html
+HOMEPAGE= http://sourceware.cygnus.com/bzip2/
COMMENT= Block-sorting file compressor
-.if exists(/usr/bin/bzip2)
-IGNORE= "${PKGNAME} is part of your ${OPSYS} distribution"
-.endif
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bzip2 ${PREFIX}/bin
${LN} -f ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bunzip2
diff --git a/archivers/bzip2/distinfo b/archivers/bzip2/distinfo
index 3bca09fa2da..1b870da0406 100644
--- a/archivers/bzip2/distinfo
+++ b/archivers/bzip2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 11:21:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/10 01:14:58 wiz Exp $
-SHA1 (bzip2-0.9.0b.tar.gz) = a86ceeb715a19fecc8355a1a9fcd71fda0d97ac4
-Size (bzip2-0.9.0b.tar.gz) = 448956 bytes
-SHA1 (patch-aa) = 9f8193e6f7f0a54565b4389d85476dee0ab31a13
-SHA1 (patch-ab) = 7449a516827f7bcb4973e11fea25d8ff7916f4d7
+SHA1 (bzip2-1.0.1.tar.gz) = 0a5a71eded51be0c15d9532b44060f61b564d4f5
+Size (bzip2-1.0.1.tar.gz) = 464991 bytes
+SHA1 (patch-aa) = 21b3a6b55a03da6de467b08f1ccd634d632f08fe
diff --git a/archivers/bzip2/patches/patch-aa b/archivers/bzip2/patches/patch-aa
index 46e20e8a908..b7b384ae40e 100644
--- a/archivers/bzip2/patches/patch-aa
+++ b/archivers/bzip2/patches/patch-aa
@@ -1,30 +1,17 @@
-$NetBSD: patch-aa,v 1.1 1998/10/14 21:51:14 tron Exp $
+$NetBSD: patch-aa,v 1.2 2001/06/10 01:14:59 wiz Exp $
---- Makefile.orig Wed Sep 9 13:30:41 1998
-+++ Makefile Wed Oct 14 23:36:32 1998
-@@ -14,12 +14,13 @@
+--- Makefile.orig Fri Jun 23 22:34:47 2000
++++ Makefile
+@@ -15,10 +15,10 @@
+ all: libbz2.a bzip2 bzip2recover test
- bzip2: lib
- $(CC) $(CFLAGS) -c bzip2.c
+ bzip2: libbz2.a bzip2.o
- $(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 @@
+ bzip2recover: bzip2recover.o
+- $(CC) $(CFLAGS) -o bzip2recover bzip2recover.o
++ $(CC) $(CFLAGS) -static -o bzip2recover bzip2recover.o
- 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
+ libbz2.a: $(OBJS)
+ rm -f libbz2.a