diff options
| author | rillig <rillig> | 2005-05-10 00:01:07 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-05-10 00:01:07 +0000 |
| commit | 00e0f7735ce0c7bfb3c9242de3bbdb94aa0c2fb8 (patch) | |
| tree | 13c7e5da8de53051eb083f4fe1dc0725aa238b54 /archivers/pbzip2 | |
| parent | dc50c25dd472013dfa29d76ffded6d8d5f0359ea (diff) | |
| download | pkgsrc-00e0f7735ce0c7bfb3c9242de3bbdb94aa0c2fb8.tar.gz | |
Replaced the package-supplied Makefile with a BSD-style one. Should fix
the bulk-build on NetBSD-1.6.2/i386.
Diffstat (limited to 'archivers/pbzip2')
| -rw-r--r-- | archivers/pbzip2/Makefile | 5 | ||||
| -rw-r--r-- | archivers/pbzip2/files/Makefile | 10 | ||||
| -rw-r--r-- | archivers/pbzip2/patches/patch-aa | 16 |
3 files changed, 14 insertions, 17 deletions
diff --git a/archivers/pbzip2/Makefile b/archivers/pbzip2/Makefile index 0797ceded7c..c7f89018b29 100644 --- a/archivers/pbzip2/Makefile +++ b/archivers/pbzip2/Makefile @@ -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 @@ HOMEPAGE= http://compression.ca/pbzip2/ 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 --git a/archivers/pbzip2/files/Makefile b/archivers/pbzip2/files/Makefile new file mode 100644 index 00000000000..59f269d9a74 --- /dev/null +++ b/archivers/pbzip2/files/Makefile @@ -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 --git a/archivers/pbzip2/patches/patch-aa b/archivers/pbzip2/patches/patch-aa deleted file mode 100644 index a1946bd6d36..00000000000 --- a/archivers/pbzip2/patches/patch-aa +++ /dev/null @@ -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 |