[pkgsrc/trunk]: pkgsrc/archivers/pbzip2 Replaced the package-supplied Makefil...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/46c08c59cb48
branches:  trunk
changeset: 493579:46c08c59cb48
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue May 10 00:01:07 2005 +0000

description:
Replaced the package-supplied Makefile with a BSD-style one. Should fix
the bulk-build on NetBSD-1.6.2/i386.

diffstat:

 archivers/pbzip2/Makefile         |   5 ++++-
 archivers/pbzip2/files/Makefile   |  10 ++++++++++
 archivers/pbzip2/patches/patch-aa |  16 ----------------
 3 files changed, 14 insertions(+), 17 deletions(-)

diffs (53 lines):

diff -r 361bde8aae88 -r 46c08c59cb48 archivers/pbzip2/Makefile
--- a/archivers/pbzip2/Makefile Mon May 09 23:50:05 2005 +0000
+++ b/archivers/pbzip2/Makefile Tue May 10 00:01:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:49 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/10 00:01:07 rillig Exp $
 #
 
 DISTNAME=              pbzip2-0.9.2
@@ -10,6 +10,9 @@
 COMMENT=               Parallel implementation of the bzip2 block-sorting file compressor
 
 PTHREAD_AUTO_VARS=     yes
+PTHREAD_OPTS+=         require
+MAKE_FLAGS+=           LDADD=${LIBS:Q}" -lbz2"
+MAKEFILE=              ${FILESDIR}/Makefile
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/pbzip2 ${PREFIX}/bin
diff -r 361bde8aae88 -r 46c08c59cb48 archivers/pbzip2/files/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/pbzip2/files/Makefile   Tue May 10 00:01:07 2005 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2005/05/10 00:01:07 rillig Exp $
+
+PROG_CXX=      pbzip2
+SRCS=          pbzip2.cpp
+NOMAN=         yes
+
+CPPFLAGS+=     -D_LARGEFILE64_SOURCE
+CPPFLAGS+=     -D_FILE_OFFSET_BITS=64
+
+.include <bsd.prog.mk>
diff -r 361bde8aae88 -r 46c08c59cb48 archivers/pbzip2/patches/patch-aa
--- a/archivers/pbzip2/patches/patch-aa Mon May 09 23:50:05 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/01/21 02:39:23 tv Exp $
-
---- Makefile.orig      2005-01-09 13:58:48.000000000 -0500
-+++ Makefile
-@@ -1,10 +1,9 @@
- # Make file for parallel BZIP2
--CC=g++
- 
- all: pbzip2
- 
- pbzip2: pbzip2.cpp
--      $(CC) -O3 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o pbzip2 pbzip2.cpp -pthread -lpthread -lbz2
-+      $(LINK.cc) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o pbzip2 pbzip2.cpp -lbz2
- 
- pbzip2-static: libbz2.a pbzip2.cpp
-       $(CC) -O3 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o pbzip2 pbzip2.cpp -pthread -lpthread -L. -lbz2