diff options
author | rillig <rillig> | 2005-08-28 17:36:52 +0000 |
---|---|---|
committer | rillig <rillig> | 2005-08-28 17:36:52 +0000 |
commit | 6aa052de99c2a0a5d05316a1b319165c67868b11 (patch) | |
tree | 89a329b0e24f705203fe9cad70ceaaad8fff79cb | |
parent | 13809d441a27baf7d4248b722caa21d5bba0d955 (diff) | |
download | pkgsrc-6aa052de99c2a0a5d05316a1b319165c67868b11.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.
-rw-r--r-- | archivers/pbzip2/Makefile | 12 | ||||
-rw-r--r-- | archivers/pbzip2/files/Makefile | 10 |
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> |