From 52ff68919f3e531cfc00fcfc3b8f8d84eb4acd25 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 7 Aug 2012 08:44:49 +0200
Subject: [PATCH] pbzip2: update to 1.1.8.

---
 srcpkgs/pbzip2/patches/fix_Makefile.diff | 90 ------------------------
 srcpkgs/pbzip2/pbzip2.rshlibs            |  1 +
 srcpkgs/pbzip2/template                  | 17 +++--
 3 files changed, 14 insertions(+), 94 deletions(-)
 delete mode 100644 srcpkgs/pbzip2/patches/fix_Makefile.diff

diff --git a/srcpkgs/pbzip2/patches/fix_Makefile.diff b/srcpkgs/pbzip2/patches/fix_Makefile.diff
deleted file mode 100644
index eda19cf46dc..00000000000
--- a/srcpkgs/pbzip2/patches/fix_Makefile.diff
+++ /dev/null
@@ -1,90 +0,0 @@
---- Makefile.orig	2011-02-19 11:10:22.000000000 +0100
-+++ Makefile	2011-02-19 22:27:39.791008472 +0100
-@@ -2,30 +2,28 @@
- SHELL = /bin/sh
- 
- # Compiler to use
--CC = g++
--CFLAGS = -O2
--#CFLAGS += -g -Wall
--#CFLAGS += -ansi
--#CFLAGS += -pedantic
--#CFLAGS += -std=c++0x
-+#CXXFLAGS += -g -Wall
-+#CXXFLAGS += -ansi
-+#CXXFLAGS += -pedantic
-+#CXXFLAGS += -std=c++0x
- 
- # Comment out CFLAGS line below for compatability mode for 32bit file sizes
- # (less than 2GB) and systems that have compilers that treat int as 64bit
- # natively (ie: modern AIX)
--CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- 
- # Uncomment CFLAGS line below if you want to compile pbzip2 without load
- # average support for systems that do not support it
--#CFLAGS += -DPBZIP_NO_LOADAVG
-+#CXXFLAGS += -DPBZIP_NO_LOADAVG
- 
- # Uncomment CFLAGS line below to get debug output
--#CFLAGS += -DPBZIP_DEBUG
-+#CXXFLAGS += -DPBZIP_DEBUG
- 
- # Comment out CFLAGS line below to disable pthread semantics in code
--CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
-+CXXFLAGS += -D_POSIX_PTHREAD_SEMANTICS
- 
- # Comment out CFLAGS line below to disable Thread stack size customization
--CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
-+CXXFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
- 
- # Comment out CFLAGS line below to explicity set ignore trailing garbage
- # default behavior: 0 - disabled; 1 - enabled (ignore garbage by default)
-@@ -34,36 +32,32 @@ CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
- #CFLAGS += -DIGNORE_TRAILING_GARBAGE=1
- 
- # On some compilers -pthreads
--CFLAGS += -pthread
-+CXXFLAGS += -pthread
- 
- # External libraries
--LDFLAGS = -lbz2
--LDFLAGS += -lpthread
-+LIBS = -lbz2
-+LIBS += -lpthread
- 
- # Where you want pbzip2 installed when you do 'make install'
--PREFIX = /usr
-+PREFIX = $(DESTDIR)/usr
-+MANDIR = $(PREFIX)/share/man
- 
- all: pbzip2
- 
- # Standard pbzip2 compile
- pbzip2: pbzip2.cpp BZ2StreamScanner.cpp
--	$(CC) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2
- 
- # Choose this if you want to compile in a static version of the libbz2 library
- pbzip2-static: pbzip2.cpp BZ2StreamScanner.cpp libbz2.a
--	$(CC) $(CFLAGS) $^ -o pbzip2 -I. -L. $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 -I. -L.
- 
- # Install the binary pbzip2 program and man page
- install: pbzip2
--	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
--	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
--	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
--	cp -f pbzip2 $(PREFIX)/bin/pbzip2
--	chmod a+x $(PREFIX)/bin/pbzip2
--	ln -s -f $(PREFIX)/bin/pbzip2 $(PREFIX)/bin/pbunzip2
--	ln -s -f $(PREFIX)/bin/pbzip2 $(PREFIX)/bin/pbzcat
--	cp -f pbzip2.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/pbzip2.1
-+	install -d $(PREFIX)/bin
-+	install -d $(MANDIR)/man1
-+	install -m 755 pbzip2 $(PREFIX)/bin/pbzip2
-+	install -m 644 pbzip2.1 $(MANDIR)/man1/pbzip2.1
- 
- clean:
- 	rm -f *.o pbzip2
diff --git a/srcpkgs/pbzip2/pbzip2.rshlibs b/srcpkgs/pbzip2/pbzip2.rshlibs
index b434d7fa2d7..b3ce71b64d8 100644
--- a/srcpkgs/pbzip2/pbzip2.rshlibs
+++ b/srcpkgs/pbzip2/pbzip2.rshlibs
@@ -1,5 +1,6 @@
 libbz2.so.1
 libpthread.so.0
 libstdc++.so.6
+libm.so.6 x86_64
 libgcc_s.so.1
 libc.so.6
diff --git a/srcpkgs/pbzip2/template b/srcpkgs/pbzip2/template
index 65520ca364f..63fdf7e83b0 100644
--- a/srcpkgs/pbzip2/template
+++ b/srcpkgs/pbzip2/template
@@ -1,12 +1,15 @@
 # Template build file for 'pbzip2'.
 pkgname=pbzip2
-version=1.1.2
-distfiles="http://compression.ca/pbzip2/pbzip2-$version.tar.gz"
-build_style=gnu-makefile
+version=1.1.8
 revision=1
+build_style=gnu-makefile
+make_install_args="PREFIX=${XBPS_DESTDIR}/${pkgname}-${version}/usr"
 short_desc="Parallel bzip2 file compressor"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e6565c2a020606d2bacd2c97873079a0996959944058d2df57cefde41ad43658
+homepage="http://compression.ca/pbzip2/"
+license="BSD"
+distfiles="https://launchpad.net/pbzip2/1.1/${version}/+download/pbzip2-${version}.tar.gz"
+checksum=d2da7e65d2a2ba5426d6d9bcd15d86cc5f90038efabd5dbc1ef9bded21371f53
 long_desc="
  The pbzip2 program is a parallel version of bzip2 for use on shared
  memory machines. It provides near-linear speedup when used on true
@@ -14,3 +17,9 @@ long_desc="
  The output is fully compatible with the regular bzip2 data so any
  files created with pbzip2 can be uncompressed by bzip2 and vice-versa."
 
+post_install() {
+	vmkdir usr/share
+	mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share
+
+	vinstall COPYING 644 usr/share/licenses/${pkgname}
+}