From 04264bd34a9af84e52f731b721c9d74baadeac3d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 19 Feb 2011 23:18:39 +0100
Subject: [PATCH] pbzip2: update to 1.1.2.

---
 srcpkgs/pbzip2/patches/fix_Makefile.diff | 68 ++++++++++++++++++++++--
 srcpkgs/pbzip2/template                  |  7 ++-
 2 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pbzip2/patches/fix_Makefile.diff b/srcpkgs/pbzip2/patches/fix_Makefile.diff
index 38e90870e2d..eda19cf46dc 100644
--- a/srcpkgs/pbzip2/patches/fix_Makefile.diff
+++ b/srcpkgs/pbzip2/patches/fix_Makefile.diff
@@ -1,7 +1,57 @@
---- Makefile.orig	2009-01-08 22:08:17.000000000 +0100
-+++ Makefile	2009-09-18 11:14:04.183561770 +0200
-@@ -15,7 +15,8 @@ CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_
- #CFLAGS += -DPBZIP_NO_LOADAVG
+--- 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
@@ -10,7 +60,15 @@
  
  all: pbzip2
  
-@@ -29,15 +30,10 @@ pbzip2-static: pbzip2.cpp libbz2.a
+ # 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
diff --git a/srcpkgs/pbzip2/template b/srcpkgs/pbzip2/template
index 16ffda68c6a..d8073098b44 100644
--- a/srcpkgs/pbzip2/template
+++ b/srcpkgs/pbzip2/template
@@ -1,12 +1,11 @@
 # Template build file for 'pbzip2'.
 pkgname=pbzip2
-version=1.0.5
-revision=2
-distfiles="http://compression.ca/$pkgname/$pkgname-$version.tar.gz"
+version=1.1.2
+distfiles="http://compression.ca/pbzip2/pbzip2-$version.tar.gz"
 build_style=gnu_makefile
 short_desc="Parallel bzip2 file compressor"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=415d8c8a69080b7e55a50784852971fca249cd9e5ec4ada8e617ca2696c9896d
+checksum=e6565c2a020606d2bacd2c97873079a0996959944058d2df57cefde41ad43658
 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