summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-08-28 17:36:52 +0000
committerrillig <rillig@pkgsrc.org>2005-08-28 17:36:52 +0000
commitcf13a19d4834559b1198f29d098a634d57cce664 (patch)
tree89a329b0e24f705203fe9cad70ceaaad8fff79cb /archivers
parentc0782d7d80e07becfea06434e10df614e989f0a0 (diff)
downloadpkgsrc-cf13a19d4834559b1198f29d098a634d57cce664.tar.gz
Replaced files/Makefile with an explicit do-build target, which does not
rely on PROG_CXX being known to <bsd.prog.mk>. This has been a problem on some non-NetBSD platforms. Noted by minskim. Tested on NetBSD-1.6.2 and Solaris/SunPro.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/pbzip2/Makefile12
-rw-r--r--archivers/pbzip2/files/Makefile10
2 files changed, 9 insertions, 13 deletions
diff --git a/archivers/pbzip2/Makefile b/archivers/pbzip2/Makefile
index 8062938f2e4..328d756b4b5 100644
--- a/archivers/pbzip2/Makefile
+++ b/archivers/pbzip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/28 17:36:52 rillig Exp $
#
DISTNAME= pbzip2-0.9.2
@@ -11,11 +11,17 @@ 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
+
+CPPFLAGS+= -D_LARGEFILE_SOURCE=1
+CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+LIBS+= -lbz2
INSTALLATION_DIRS= bin
+do-build:
+ cd ${WRKSRC}; \
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o pbzip2 pbzip2.cpp $(LIBS)
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pbzip2 ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pbzip2
diff --git a/archivers/pbzip2/files/Makefile b/archivers/pbzip2/files/Makefile
deleted file mode 100644
index 59f269d9a74..00000000000
--- a/archivers/pbzip2/files/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $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>