Revision: 15370
http://gar.svn.sourceforge.net/gar/?rev=15370&view=rev
Author: dmichelsen
Date: 2011-08-18 15:10:47 +0000 (Thu, 18 Aug 2011)
Log Message:
-----------
bzip2: Update to 1.0.6 and general rework
Modified Paths:
--------------
csw/mgar/pkg/bzip2/trunk/Makefile
csw/mgar/pkg/bzip2/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/bzip2/trunk/files/0001-Fix-build-for-shared-lib-for-Solaris-linker.patch
Removed Paths:
-------------
csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch
csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch
Modified: csw/mgar/pkg/bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzip2/trunk/Makefile 2011-08-18 14:49:14 UTC (rev 15369)
+++ csw/mgar/pkg/bzip2/trunk/Makefile 2011-08-18 15:10:47 UTC (rev 15370)
@@ -1,90 +1,91 @@
# $Id$
NAME = bzip2
-VERSION = 1.0.5
+VERSION = 1.0.6
CATEGORIES = utils
DESCRIPTION = Compression Utility
define BLURB
-bzip2 is a freely available, patent free, high-quality data compressor. It
typically
-compresses files to within 10% to 15% of the best available techniques (the
PPM family of
-statistical compressors), whilst being around twice as fast at compression and
six
-times faster at decompression.
+ bzip2 is a freely available, patent free, high-quality data compressor. It
typically
+ compresses files to within 10% to 15% of the best available techniques (the
PPM family of
+ statistical compressors), whilst being around twice as fast at compression
and six
+ times faster at decompression.
endef
MASTER_SITES = http://www.bzip.org/$(VERSION)/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-PATCHFILES = 0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
-PATCHFILES += 0002-test-should-depend-on-bzip2.patch
-PATCHFILES += 0003-generate-bzip2recover.patch
+DISTFILES = $(DISTNAME).tar.gz
-PACKAGES = CSWbzip2
-CATALOGNAME = bzip2
+PATCHFILES += 0001-Fix-build-for-shared-lib-for-Solaris-linker.patch
+PACKAGES += CSWbzip2
+SPKG_DESC_CSWbzip2 += Compression utility for bzip2 compression algorithm
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWbzip2 += CSWlibbz2-1-0
+
+PACKAGES += CSWlibbz2-1-0
+SPKG_DESC_CSWlibbz2-1-0 = Compression library, libbz2.so.1.0
+PKGFILES_CSWlibbz2-1-0 += $(call pkgfiles_lib,libbz2.so.1.0)
+
+PACKAGES += CSWlibbz2-dev
+SPKG_DESC_CSWlibbz2-dev = Development files for libbz2.so.1.0
+PKGFILES_CSWlibbz2-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibbz2-dev += $(docdir)/.*
+RUNTIME_DEP_PKGS_CSWlibbz2-dev += CSWlibbz2-1-0
+CHECKPKG_OVERRIDES_CSWlibbz2-dev += surplus-dependency|CSWlibbz2-1-0
+# These are default install locations
+CHECKPKG_OVERRIDES_CSWlibbz2-dev +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/bzip2/CHANGES
+CHECKPKG_OVERRIDES_CSWlibbz2-dev +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/bzip2/README
+
LICENSE = LICENSE
-BUILD64 = 1
-MERGE_DIRS_isa-extra = $(libdir)
+BUILD64 = 1
-EXTRA_CFLAGS += -KPIC -D_FILE_OFFSET_BITS=64
-LDFLAGS += $(LD_OPTIONS)
+EXTRA_CFLAGS += -KPIC
+EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
-BUILD_ARGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-
-BUILD_SCRIPTS = custom
-TEST_SCRIPTS = custom
+BUILD_ARGS += -f Makefile-libbz2_so
CONFIGURE_SCRIPTS =
-INSTALL_SCRIPTS = custom
+TEST_ARGS += -f Makefile-libbz2_so
+INSTALL_SCRIPTS = custom
-# The tests will fail if CSWbzip2 isn't already installed, since the runpath
for
-# bzip2 goes through /opt/csw/lib/... instead of . - just help it out here.
-LD_LIBRARY_PATH=.
-export LD_LIBRARY_PATH
-EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH
+DOCFILES += CHANGES
+DOCFILES += README
+DOCFILES += manual.html
+DOCFILES += manual.pdf
+DOCFILES += manual.xml
+BINFILES += bzip2
+BINFILES += bzdiff
+BINFILES += bzgrep
+BINFILES += bzip2recover
+BINFILES += bzmore
+LIBFILES += libbz2.so.$(VERSION)
+INCFILES += bzlib.h
include gar/category.mk
-DOCFILES = CHANGES README manual.html manual.pdf manual.xml
-BINFILES = bzip2 bzdiff bzgrep bzip2recover bzmore
-LIBFILES = libbz2.so.1.0.5
-INCFILES = bzlib.h
-
-build-custom:
- $(MAKE) -C $(WORKSRC) -f Makefile-libbz2_so $(BUILD_ARGS)
- @$(MAKECOOKIE)
-
-test-custom:
- $(MAKE) -C $(WORKSRC) -f Makefile-libbz2_so test
- @$(MAKECOOKIE)
-
install-custom:
@echo " => Installing $(CATALOGNAME)"
- @ginstall -d $(DESTDIR)$(includedir)
- @ginstall -d $(DESTDIR)$(libdir)
- @ginstall -d $(DESTDIR)$(bindir)
- @ginstall -d $(DESTDIR)$(docdir)/$(NAME)
- @# install the libraries
- @( for file in $(LIBFILES) ; do \
- ginstall -c -m 755 $(WORKSRC)/$$file $(DESTDIR)$(libdir) ; \
- done )
- @ln -s -f $(DESTDIR)$(libdir)/libbz2.so.1.0.5
$(DESTDIR)$(libdir)/libbz2.so
- @ln -s -f $(DESTDIR)$(libdir)/libbz2.so.1.0.5
$(DESTDIR)$(libdir)/libbz2.so.1.0
- @# install the binaries
- @( for file in $(BINFILES) ; do \
- ginstall -m 755 $(WORKSRC)/$$file $(DESTDIR)$(bindir) ; \
- done )
- @ginstall -m 755 $(WORKSRC)/bzip2 $(DESTDIR)$(bindir)/bunzip2
- @ginstall -m 755 $(WORKSRC)/bzip2 $(DESTDIR)$(bindir)/bzcat
- @ln -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzegrep
- @ln -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzfgrep
- @ln -f $(DESTDIR)$(bindir)/bzmore $(DESTDIR)$(bindir)/bzless
- @ln -f $(DESTDIR)$(bindir)/bzdiff $(DESTDIR)$(bindir)/bzcmp
- @# install the include files
- @( for file in $(INCFILES) ; do \
- ginstall -m 644 $(WORKSRC)/$$file $(DESTDIR)$(includedir) ; \
- done )
- @# install the doc files
- @( for file in $(DOCFILES) ; do \
- ginstall -m 644 $(WORKSRC)/$$file $(DESTDIR)$(docdir)/$(NAME) ; \
- done )
+ ginstall -d $(DESTDIR)$(libdir)
+ cd $(WORKSRC) && ginstall -c -m 755 $(LIBFILES) $(DESTDIR)$(libdir)
+ ln -s libbz2.so.$(VERSION) $(DESTDIR)$(libdir)/libbz2.so
+ ln -s libbz2.so.$(VERSION) $(DESTDIR)$(libdir)/libbz2.so.1.0
+ ginstall -d $(DESTDIR)$(bindir)
+ cd $(WORKSRC) && ginstall -m 755 $(BINFILES) $(DESTDIR)$(bindir)/
+ cd $(DESTDIR)$(bindir) && \
+ ln bzip2 bunzip2 && \
+ ln bzip2 bzcat && \
+ ln bzgrep bzegrep && \
+ ln bzgrep bzfgrep && \
+ ln bzmore bzless && \
+ ln bzdiff bzcmp
+ ginstall -d $(DESTDIR)$(mandir)/man1
+ cd $(WORKSRC) && ginstall -m 644 bzip2.1 bzdiff.1 bzgrep bzip2recover
$(DESTDIR)$(mandir)/man1/
+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzegrep.1
+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzfgrep.1
+ echo ".so man1/bzmore.1" > $(DESTDIR)$(mandir)/man1/bzless.1
+ echo ".so man1/bzdiff.1" > $(DESTDIR)$(mandir)/man1/bzcmp.1
+ ginstall -d $(DESTDIR)$(includedir)
+ cd $(WORKSRC) && ginstall -m 644 $(INCFILES) $(DESTDIR)$(includedir)/
+ ginstall -d $(DESTDIR)$(docdir)/$(NAME)
+ cd $(WORKSRC) && ginstall -m 644 $(DOCFILES)
$(DESTDIR)$(docdir)/$(NAME)/
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/bzip2/trunk/checksums
===================================================================
--- csw/mgar/pkg/bzip2/trunk/checksums 2011-08-18 14:49:14 UTC (rev 15369)
+++ csw/mgar/pkg/bzip2/trunk/checksums 2011-08-18 15:10:47 UTC (rev 15370)
@@ -1,4 +1 @@
-e75c460d8ff1a91bd295277824b4f080
0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
-989947c7661176ad26174bf5b65f4ee0 0002-test-should-depend-on-bzip2.patch
-f76155cd90d532f21ea33d5e681ba3a9 0003-generate-bzip2recover.patch
-3c15a0c8d1d3ee1c46a1634d00617b1a bzip2-1.0.5.tar.gz
+00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz
Deleted:
csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
===================================================================
---
csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
2011-08-18 14:49:14 UTC (rev 15369)
+++
csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
2011-08-18 15:10:47 UTC (rev 15370)
@@ -1,77 +0,0 @@
-From 35021e8f149f06a789417a41bbc784182910ec18 Mon Sep 17 00:00:00 2001
-From: Gordon Marler <gmar...@opencsw.org>
-Date: Fri, 20 Aug 2010 05:19:08 +0200
-Subject: [PATCH] CFLAGS LDFLAGS for SOS12 shared lib
-
----
- Makefile-libbz2_so | 34 ++++++++++++++++++++++++++--------
- 1 files changed, 26 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
-index 9a13c77..23c1a12 100644
---- a/Makefile-libbz2_so
-+++ b/Makefile-libbz2_so
-@@ -1,6 +1,6 @@
-
- # This Makefile builds a shared version of the library,
--# libbz2.so.1.0.4, with soname libbz2.so.1.0,
-+# libbz2.so.1.0.5, with soname libbz2.so.1.0,
- # at least on x86-Linux (RedHat 7.2),
- # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).
- # Please see the README file for some important info
-@@ -22,9 +22,8 @@
-
-
- SHELL=/bin/sh
--CC=gcc
--BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-+
-+
-
- OBJS= blocksort.o \
- huffman.o \
-@@ -35,13 +34,13 @@ OBJS= blocksort.o \
- bzlib.o
-
- all: $(OBJS)
-- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
-- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
-+ $(CC) -G $(CFLAGS) $(LDFLAGS) -o libbz2.so.1.0.5 $(OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.c libbz2.so.1.0.5
- rm -f libbz2.so.1.0
-- ln -s libbz2.so.1.0.4 libbz2.so.1.0
-+ ln -s libbz2.so.1.0.5 libbz2.so.1.0
-
- clean:
-- rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
-+ rm -f $(OBJS) bzip2.o libbz2.so.1.0.5 libbz2.so.1.0 bzip2
-
- blocksort.o: blocksort.c
- $(CC) $(CFLAGS) -c blocksort.c
-@@ -57,3 +56,22 @@ decompress.o: decompress.c
- $(CC) $(CFLAGS) -c decompress.c
- bzlib.o: bzlib.c
- $(CC) $(CFLAGS) -c bzlib.c
-+
-+check: test
-+
-+test: all
-+ @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
-+
---
-1.7.1
-
Added:
csw/mgar/pkg/bzip2/trunk/files/0001-Fix-build-for-shared-lib-for-Solaris-linker.patch
===================================================================
---
csw/mgar/pkg/bzip2/trunk/files/0001-Fix-build-for-shared-lib-for-Solaris-linker.patch
(rev 0)
+++
csw/mgar/pkg/bzip2/trunk/files/0001-Fix-build-for-shared-lib-for-Solaris-linker.patch
2011-08-18 15:10:47 UTC (rev 15370)
@@ -0,0 +1,75 @@
+From 3d6ba563435533b4093a409bcd27db652239cd81 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Thu, 18 Aug 2011 14:35:35 +0200
+Subject: [PATCH] Fix build for shared lib for Solaris linker
+
+---
+ Makefile-libbz2_so | 39 ++++++++++++++++++++++++++++++---------
+ 1 files changed, 30 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
+index e58791b..a492706 100644
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
+@@ -22,9 +22,6 @@
+
+
+ SHELL=/bin/sh
+-CC=gcc
+-BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
+
+ OBJS= blocksort.o \
+ huffman.o \
+@@ -34,14 +31,19 @@ OBJS= blocksort.o \
+ decompress.o \
+ bzlib.o
+
+-all: $(OBJS)
+- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+- rm -f libbz2.so.1.0
+- ln -s libbz2.so.1.0.6 libbz2.so.1.0
++all: libbz2.so.1.0.6 bzip2 bzip2recover
++
++bzip2: libbz2.so.1.0.6
++ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.c libbz2.so.1.0.6
++
++bzip2recover: bzip2recover.o
++ $(CC) $(CFLAGS) -o bzip2recover bzip2recover.o
++
++libbz2.so.1.0.6: $(OBJS)
++ $(CC) -G $(CFLAGS) -h libbz2.so.1.0 $(LDFLAGS) -o libbz2.so.1.0.6
$(OBJS)
+
+ clean:
+- rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
++ rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2
+
+ blocksort.o: blocksort.c
+ $(CC) $(CFLAGS) -c blocksort.c
+@@ -57,3 +59,22 @@ decompress.o: decompress.c
+ $(CC) $(CFLAGS) -c decompress.c
+ bzlib.o: bzlib.c
+ $(CC) $(CFLAGS) -c bzlib.c
++
++check: test
++
++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
++
+--
+1.7.6
+
Deleted: csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch
===================================================================
--- csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch
2011-08-18 14:49:14 UTC (rev 15369)
+++ csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch
2011-08-18 15:10:47 UTC (rev 15370)
@@ -1,25 +0,0 @@
-From 9ee98dbae36b812549127094a4140f1278d67ecf Mon Sep 17 00:00:00 2001
-From: Gordon Marler <gmar...@opencsw.org>
-Date: Fri, 20 Aug 2010 05:47:48 +0200
-Subject: [PATCH] test should depend on bzip2
-
----
- Makefile-libbz2_so | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
-index 1494abd..b980404 100644
---- a/Makefile-libbz2_so
-+++ b/Makefile-libbz2_so
-@@ -59,7 +59,7 @@ bzlib.o: bzlib.c
-
- check: test
-
--test: all
-+test: bzip2
- @cat words1
- ./bzip2 -1 < sample1.ref > sample1.rb2
- ./bzip2 -2 < sample2.ref > sample2.rb2
---
-1.7.1
-
Deleted: csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch
===================================================================
--- csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch
2011-08-18 14:49:14 UTC (rev 15369)
+++ csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch
2011-08-18 15:10:47 UTC (rev 15370)
@@ -1,35 +0,0 @@
-From 8c2999a502b88621e39ec11e9cc60106236b5bd6 Mon Sep 17 00:00:00 2001
-From: Gordon Marler <gmar...@opencsw.org>
-Date: Fri, 20 Aug 2010 06:55:05 +0200
-Subject: [PATCH] generate bzip2recover
-
----
- Makefile-libbz2_so | 11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
-index b980404..2eeea45 100644
---- a/Makefile-libbz2_so
-+++ b/Makefile-libbz2_so
-@@ -33,9 +33,16 @@ OBJS= blocksort.o \
- decompress.o \
- bzlib.o
-
--all: $(OBJS)
-- $(CC) -G $(CFLAGS) $(LDFLAGS) -o libbz2.so.1.0.5 $(OBJS)
-+all: libbz2.so.1.0.5 bzip2 bzip2recover
-+
-+bzip2: libbz2.so.1.0.5
- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.c libbz2.so.1.0.5
-+
-+bzip2recover: bzip2recover.o
-+ $(CC) $(CFLAGS) -o bzip2recover bzip2recover.o
-+
-+libbz2.so.1.0.5: $(OBJS)
-+ $(CC) -G $(CFLAGS) $(LDFLAGS) -o libbz2.so.1.0.5 $(OBJS)
- rm -f libbz2.so.1.0
- ln -s libbz2.so.1.0.5 libbz2.so.1.0
-
---
-1.7.1
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
