[csw-devel] SF.net SVN: gar:[16247] csw/mgar/pkg

[dmichelsen at users.sourceforge.net]

Revision: 16247
          http://gar.svn.sourceforge.net/gar/?rev=16247&view=rev
Author:   dmichelsen
Date:     2011-11-24 14:42:49 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
lbzip2: Initial commit

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

Added Paths:
-----------
    csw/mgar/pkg/lbzip2/

Modified: csw/mgar/pkg/lbzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pbzip2/trunk/Makefile	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/lbzip2/trunk/Makefile	2011-11-24 14:42:49 UTC (rev 16247)
@@ -1,45 +1,22 @@
-NAME = pbzip2
-VERSION = 1.1.6
+NAME = lbzip2
+VERSION = 2.1
 CATEGORIES = utils
 
 DESCRIPTION = Parallel BZIP2 Data Compression Software
 define BLURB
-  PBZIP2 is a parallel implementation of the bzip2 block-sorting file 
-  compressor that uses pthreads and achieves near-linear speedup on SMP 
-  machines. The output of this version is fully compatible with 
-  bzip2 v1.0.2 or newer
 endef
 
-MASTER_SITES = http://compression.ca/pbzip2/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+MASTER_SITES = http://github.com/downloads/kjn/lbzip2/
+DISTFILES  = $(DISTNAME).tar.gz
 
-PACKAGES += CSWpbzip2
-CATALOGNAME_CSWpbzip2 = pbzip2
-SPKG_DESC_CSWpbzip2 = Parallel BZIP2 data compression software
-RUNTIME_DEP_PKGS_CSWpbzip2 += CSWlibbz2-1-0
+# Only use lbzip2 etc. and not the corresponding pbzip2 etc. programs
+EXTRA_MERGE_EXCLUDE_FILES += .*/p[^/]*
 
-# Since there is no configure script, this is intentionally left empty
-CONFIGURE_SCRIPTS =
+# Otherwise pthread_create with an "Unknown error"
+EXTRA_CFLAGS += -mt
 
-# There is no testsuite
-TEST_SCRIPTS =
+# /bin/bash is too old
+TEST_OVERRIDE_VARS += SHELL
+TEST_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash
 
-INSTALL_SCRIPTS = custom
-
-# After some testing. Using a special ISA modulation does *not* speed
-# up bzip2. Therefore I will just stick to a regular 32bit build here.
-
 include gar/category.mk
-
-pre-build-modulated:
-	gsed -i'' 's,-lpthread,-norunpath -lpthread,g;s,-pthread,-I$(includedir) -L$(libdir),g;s,g++,$(CXX),;s,-O2,-fast $(filter-out -xnorunpath,$(CFLAGS)),' $(WORKSRC)/Makefile
-
-install-custom:
-	[ ! -d "$(DESTDIR)$(mandir)/man1" ] && \
-		ginstall -d $(DESTDIR)$(mandir)/man1
-	ginstall -m 0644 $(WORKSRC)/pbzip2.1 $(DESTDIR)$(mandir)/man1
-	[ ! -d "$(DESTDIR)$(bindir)" ] && \
-		ginstall -d $(DESTDIR)$(bindir)
-	ginstall -m 0755 $(WORKSRC)/$(NAME) $(DESTDIR)$(bindir)
-	ln -s -f $(bindir)/$(NAME) $(DESTDIR)$(bindir)/pbunzip2
-	ln -s -f $(bindir)/$(NAME) $(DESTDIR)$(bindir)/pbzcat

Modified: csw/mgar/pkg/lbzip2/trunk/checksums
===================================================================
--- csw/mgar/pkg/pbzip2/trunk/checksums	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/lbzip2/trunk/checksums	2011-11-24 14:42:49 UTC (rev 16247)
@@ -1 +1 @@
-26cc5a0d882198f106e75101ff0544a3  pbzip2-1.1.6.tar.gz
+180c17fd09bbe6eeb189ffaabdc3fc4e  lbzip2-2.1.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.