[csw-devel] SF.net SVN: gar:[10784] csw/mgar/pkg/bzip2/trunk

[gmarler at users.sourceforge.net]

Revision: 10784
          http://gar.svn.sourceforge.net/gar/?rev=10784&view=rev
Author:   gmarler
Date:     2010-08-20 05:06:26 +0000 (Fri, 20 Aug 2010)

Log Message:
-----------
packaging for SPARC now works - need to add LICENSE

Modified Paths:
--------------
    csw/mgar/pkg/bzip2/trunk/Makefile
    csw/mgar/pkg/bzip2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch

Modified: csw/mgar/pkg/bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzip2/trunk/Makefile	2010-08-20 03:58:57 UTC (rev 10783)
+++ csw/mgar/pkg/bzip2/trunk/Makefile	2010-08-20 05:06:26 UTC (rev 10784)
@@ -20,6 +20,7 @@
 DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES   = 0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
 PATCHFILES  += 0002-test-should-depend-on-bzip2.patch
+PATCHFILES  += 0003-generate-bzip2recover.patch
 
 # We define upstream file regex so we can be notifed of new upstream
 # software release
@@ -47,6 +48,13 @@
 
 include gar/category.mk
 
+PLATFORM  = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi )
+OBJDIR    = $(WORKDIR)/$(DISTNAME)
+DOCFILES  = CHANGES LICENSE 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)
@@ -57,4 +65,32 @@
 
 install-custom:
 	@echo " => Installing $(CATALOGNAME)"
+	@ginstall -d $(DESTDIR)$(includedir)
+	@ginstall -d $(DESTDIR)$(libdir)
+	@ginstall -d $(DESTDIR)$(bindir)
+	@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
+	@# install the libraries
+	@( for file in $(LIBFILES) ; do \
+	     ginstall -c -m 755 $(OBJDIR)/$$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 $(OBJDIR)/$$file $(DESTDIR)$(bindir) ; \
+	   done )
+	@ginstall -m 755 $(OBJDIR)/bzip2 $(DESTDIR)$(bindir)/bunzip2
+	@ginstall -m 755 $(OBJDIR)/bzip2 $(DESTDIR)$(bindir)/bzcat
+	@ln -s -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzegrep
+	@ln -s -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzfgrep
+	@ln -s -f $(DESTDIR)$(bindir)/bzmore $(DESTDIR)$(bindir)/bzless
+	@ln -s -f $(DESTDIR)$(bindir)/bzdiff $(DESTDIR)$(bindir)/bzcmp
+	@# install the include files
+	@( for file in $(INCFILES) ; do \
+	     ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(includedir) ; \
+	   done )
+	@# install the doc files
+	@( for file in $(DOCFILES) ; do \
+	     ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(docdir)/$(GARNAME) ; \
+	   done )
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/bzip2/trunk/checksums
===================================================================
--- csw/mgar/pkg/bzip2/trunk/checksums	2010-08-20 03:58:57 UTC (rev 10783)
+++ csw/mgar/pkg/bzip2/trunk/checksums	2010-08-20 05:06:26 UTC (rev 10784)
@@ -1,3 +1,4 @@
 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

Added: csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch
===================================================================
--- csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch	                        (rev 0)
+++ csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch	2010-08-20 05:06:26 UTC (rev 10784)
@@ -0,0 +1,35 @@
+From 8c2999a502b88621e39ec11e9cc60106236b5bd6 Mon Sep 17 00:00:00 2001
+From: Gordon Marler <gmarler at 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.