head	1.12;
access;
symbols
	RELEASE_8_3_0:1.12
	RELEASE_9_0_0:1.12
	RELEASE_7_4_0:1.12
	RELEASE_8_2_0:1.12
	RELEASE_6_EOL:1.12
	RELEASE_8_1_0:1.12
	RELEASE_7_3_0:1.12
	RELEASE_8_0_0:1.12
	RELEASE_7_2_0:1.12
	RELEASE_7_1_0:1.12
	RELEASE_6_4_0:1.12
	RELEASE_5_EOL:1.12
	RELEASE_7_0_0:1.12
	RELEASE_6_3_0:1.12
	PRE_XORG_7:1.12
	RELEASE_4_EOL:1.12
	RELEASE_6_2_0:1.11
	RELEASE_6_1_0:1.11
	RELEASE_5_5_0:1.11
	RELEASE_6_0_0:1.11
	RELEASE_5_4_0:1.10
	RELEASE_4_11_0:1.10
	RELEASE_5_3_0:1.10
	RELEASE_4_10_0:1.10
	RELEASE_5_2_1:1.10
	RELEASE_5_2_0:1.10
	RELEASE_4_9_0:1.10
	RELEASE_5_1_0:1.10
	RELEASE_4_8_0:1.10
	RELEASE_5_0_0:1.10
	RELEASE_4_7_0:1.10
	RELEASE_4_6_2:1.10
	RELEASE_4_6_1:1.10
	RELEASE_4_6_0:1.10
	RELEASE_5_0_DP1:1.10
	RELEASE_4_5_0:1.9
	RELEASE_4_4_0:1.9
	RELEASE_4_3_0:1.9
	RELEASE_4_2_0:1.9
	RELEASE_4_1_1:1.9
	RELEASE_4_1_0:1.9
	RELEASE_3_5_0:1.9
	RELEASE_4_0_0:1.6
	RELEASE_3_4_0:1.6
	RELEASE_3_3_0:1.6
	bzip2_0_9_5b:1.4
	bzip2_0_9_0c:1.3
	RELEASE_3_2_0:1.3
	RELEASE_3_1_0:1.2
	RELEASE_2_2_8:1.2
	RELEASE_3_0_0:1.1
	RELEASE_2_2_7:1.1;
locks; strict;
comment	@# @;


1.12
date	2007.01.28.00.47.14;	author miwi;	state Exp;
branches;
next	1.11;

1.11
date	2005.07.20.07.50.44;	author pav;	state Exp;
branches;
next	1.10;

1.10
date	2002.02.22.13.21.22;	author dinoex;	state Exp;
branches;
next	1.9;

1.9
date	2000.06.08.14.47.17;	author sobomax;	state Exp;
branches;
next	1.8;

1.8
date	2000.05.28.03.19.46;	author steve;	state Exp;
branches;
next	1.7;

1.7
date	2000.05.19.00.32.43;	author obrien;	state Exp;
branches;
next	1.6;

1.6
date	99.08.10.07.29.49;	author obrien;	state Exp;
branches;
next	1.5;

1.5
date	99.08.06.18.45.49;	author obrien;	state Exp;
branches;
next	1.4;

1.4
date	99.08.01.03.11.10;	author obrien;	state Exp;
branches;
next	1.3;

1.3
date	99.04.24.17.19.04;	author kris;	state Exp;
branches;
next	1.2;

1.2
date	98.10.28.09.37.30;	author tg;	state Exp;
branches;
next	1.1;

1.1
date	98.04.27.21.29.55;	author mph;	state Exp;
branches;
next	;


desc
@@


1.12
log
@- Update to 1.0.4

PR:		108441
Submitted by:	Jason Harris <jharris@@widomaker.com> (maintainer)
@
text
@--- Makefile.orig	Tue Jan  2 22:49:21 2007
+++ Makefile	Sat Jan 27 12:02:14 2007
@@@@ -15,13 +15,15 @@@@
 SHELL=/bin/sh
 
 # To assist in cross-compiling
-CC=gcc
+CC?=gcc
 AR=ar
 RANLIB=ranlib
 LDFLAGS=
 
 BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
+CFLAGS?=-O2
+CFLAGS+=-Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
+SOFLAGS=-fPIC -fpic -DPIC
 
 # Where you want it installed when you do 'make install'
 PREFIX=/usr/local
@@@@ -35,10 +37,18 @@@@
       decompress.o \
       bzlib.o
 
-all: libbz2.a bzip2 bzip2recover test
+SO_OBJS= blocksort.so  \
+      huffman.so    \
+      crctable.so   \
+      randtable.so  \
+      compress.so   \
+      decompress.so \
+      bzlib.so
 
-bzip2: libbz2.a bzip2.o
-	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
+all: libbz2.so.1 libbz2.a bzip2 bzip2recover test
+
+bzip2: libbz2.so.1 libbz2.a bzip2.o
+	$(CC) $(CFLAGS) -o bzip2 bzip2.o libbz2.a
 
 bzip2recover: bzip2recover.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
@@@@ -52,6 +62,10 @@@@
 		$(RANLIB) libbz2.a ; \
 	fi
 
+libbz2.so.1: $(SO_OBJS)
+	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1 $(SO_OBJS)
+	ln -sf libbz2.so.1 libbz2.so
+
 check: test
 test: bzip2
 	@@cat words1
@@@@ -109,9 +123,25 @@@@
 	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
 
 clean: 
-	rm -f *.o libbz2.a bzip2 bzip2recover \
+	rm -f *.o *.so libbz2.a libbz2.so.1 bzip2 bzip2recover \
 	sample1.rb2 sample2.rb2 sample3.rb2 \
 	sample1.tst sample2.tst sample3.tst
+
+blocksort.so: blocksort.c
+	@@cat words0
+	$(CC) $(CFLAGS) $(SOFLAGS) -c blocksort.c -o blocksort.so
+huffman.so: huffman.c
+	$(CC) $(CFLAGS) $(SOFLAGS) -c huffman.c -o huffman.so
+crctable.so: crctable.c
+	$(CC) $(CFLAGS) $(SOFLAGS) -c crctable.c -o crctable.so
+randtable.so: randtable.c
+	$(CC) $(CFLAGS) $(SOFLAGS) -c randtable.c -o randtable.so
+compress.so: compress.c
+	$(CC) $(CFLAGS) $(SOFLAGS) -c compress.c -o compress.so
+decompress.so: decompress.c
+	$(CC) $(CFLAGS) $(SOFLAGS) -c decompress.c -o decompress.so
+bzlib.so: bzlib.c
+	$(CC) $(CFLAGS) $(SOFLAGS) -c bzlib.c -o bzlib.so
 
 blocksort.o: blocksort.c
 	@@cat words0
@


1.11
log
@- Update to 1.0.3

PR:		ports/83694
Submitted by:	Vsevolod Stakhov <vsevolod@@highsecure.ru>
Approved by:	Jason Harris <jharris@@widomaker.com> (maintainer)
@
text
@d1 3
a3 3
--- Makefile.orig	Thu Feb 17 14:28:24 2005
+++ Makefile	Tue Jul 19 02:39:56 2005
@@@@ -2,13 +2,15 @@@@
d14 1
a14 1
-CFLAGS=-Wall -Winline -O -g $(BIGFILES)
d20 2
a21 2
 PREFIX=/usr
@@@@ -22,10 +24,18 @@@@
d43 1
a43 1
@@@@ -39,6 +49,10 @@@@
d54 1
a54 1
@@@@ -96,9 +110,25 @@@@
@


1.10
log
@- Update to bzip 1.0.2, request maintainership

PR:		34968
Submitted by:	jharris@@widomaker.com
@
text
@d1 3
a3 3
--- Makefile	2002/02/14 03:34:07	1.1
+++ Makefile	2002/02/14 03:53:34
@@@@ -2,14 +2,16 @@@@
a12 1
 # Suitably paranoid flags to avoid bugs in gcc-2.7
d14 1
a14 1
-CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
d21 1
a21 1
@@@@ -23,10 +25,18 @@@@
d43 1
a43 1
@@@@ -40,6 +50,10 @@@@
d54 2
a55 1
@@@@ -98,9 +112,25 @@@@
a56 1
 distclean: clean
@


1.9
log
@Build shared library as well.
@
text
@d1 4
a4 3
--- Makefile.orig	Wed May 17 00:31:04 2000
+++ Makefile	Thu Jun  8 17:41:26 2000
@@@@ -1,8 +1,10 @@@@
d6 1
a6 1
 SHELL=/bin/sh
d9 5
d20 3
a22 3
 OBJS= blocksort.o  \
       huffman.o    \
@@@@ -12,10 +14,18 @@@@
d36 1
a36 1
-	$(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2
d43 3
a45 3
 	$(CC) $(CFLAGS) -o bzip2recover bzip2recover.o
@@@@ -29,6 +39,10 @@@@
 		ranlib libbz2.a ; \
d52 1
d55 1
a55 3
 	./bzip2 -1  < sample1.ref > sample1.rb2
@@@@ -69,12 +83,27 @@@@
 	chmod a+r $(PREFIX)/lib/libbz2.a
d57 1
d63 1
a63 2
 
-blocksort.o: blocksort.c
d65 1
a65 1
 	@@cat words0
d79 3
a81 5
+
+blocksort.o: blocksort.c
 	$(CC) $(CFLAGS) -c blocksort.c
 huffman.o: huffman.c
 	$(CC) $(CFLAGS) -c huffman.c
@


1.8
log
@Don't forceably add -O2 to CFLAGS as this is known to cause problems
because of optimization bugs in the compiler on the Alpha.
@
text
@d1 3
a3 3
--- Makefile.orig	Tue May 16 16:31:04 2000
+++ Makefile	Sat May 27 16:54:49 2000
@@@@ -1,8 +1,9 @@@@
d12 1
d16 63
@


1.7
log
@Upgrade to version 1.0.0.
@
text
@d1 4
a4 3
--- Makefile.orig	Tue May 16 14:31:04 2000
+++ Makefile	Thu May 18 17:31:44 2000
@@@@ -2,5 +2,6 @@@@
d11 1
a11 1
+CFLAGS+=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
d13 2
@


1.6
log
@Update to version 0.9.5c.  This fixes the bug compressing
/usr/ports/textproc/dsssl-docbook-modular/pkg/PLIST reported by
John Milford <jwm@@CSUA.Berkeley.EDU>.
@
text
@d1 3
a3 4
--- Makefile.orig	Tue Jul  6 15:38:07 1999
+++ Makefile	Tue Aug 10 00:24:52 1999
@@@@ -1,7 +1,8 @@@@
 
a5 1
-CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce
d7 2
d10 1
a10 1
+CFLAGS+=-Wall -Winline -fomit-frame-pointer -fno-strength-reduce
a11 2
 OBJS= blocksort.o  \
       huffman.o    \
@


1.5
log
@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>
@
text
@d1 3
a3 3
--- Makefile.orig	Fri Oct 23 04:57:22 1998
+++ Makefile	Wed Mar 24 00:19:11 1999
@@@@ -1,6 +1,7 @@@@
d5 1
d7 1
a7 1
-CFLAGS=-Wall -O2 -fomit-frame-pointer -fno-strength-reduce
d10 1
a10 1
+CFLAGS+=-Wall -fomit-frame-pointer -fno-strength-reduce
a13 17
@@@@ -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:
@


1.4
log
@Upgrade to version 0.9.5b.  (the "b" here does not stand for "beta")
@
text
@d1 3
a3 3
--- Makefile.orig	Tue Jul  6 15:38:07 1999
+++ Makefile	Sat Jul 31 19:48:44 1999
@@@@ -1,7 +1,8 @@@@
a4 1
 SHELL=/bin/sh
d6 1
a6 1
-CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce
d13 17
@


1.3
log
@Respect CC, CFLAGS.
@
text
@d1 3
a3 3
--- Makefile.orig	Fri Oct 23 04:57:22 1998
+++ Makefile	Wed Mar 24 00:19:11 1999
@@@@ -1,6 +1,7 @@@@
d5 1
d7 1
a7 1
-CFLAGS=-Wall -O2 -fomit-frame-pointer -fno-strength-reduce
a13 17
@@@@ -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:
@


1.2
log
@Upgrade to 0.9.0c.
@
text
@d1 13
a13 3
--- Makefile.orig	Thu Oct 22 21:27:22 1998
+++ Makefile	Wed Oct 28 10:25:29 1998
@@@@ -20,6 +20,7 @@@@
d21 1
a21 1
@@@@ -38,7 +39,7 @@@@
@


1.1
log
@Add patch to respect CC and CFLAGS.
@
text
@d1 7
a7 10
--- Makefile.orig	Fri Aug 29 19:36:29 1997
+++ Makefile	Mon Apr 27 17:25:13 1998
@@@@ -1,8 +1,8 @@@@
 
-CC = gcc
+#CC = gcc
 SH = /bin/sh
 
-CFLAGS = -O3 -fomit-frame-pointer -funroll-loops
+#CFLAGS = -O3 -fomit-frame-pointer -funroll-loops
d9 5
d15 3
d19 1
@

