[pkgsrc/trunk]: pkgsrc/archivers/pbzip2 Replaced files/Makefile with an expli...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d68cdbaa67ec
branches:  trunk
changeset: 498641:d68cdbaa67ec
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Aug 28 17:36:52 2005 +0000

description:
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:

 archivers/pbzip2/Makefile       |  12 +++++++++---
 archivers/pbzip2/files/Makefile |  10 ----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diffs (43 lines):

diff -r e1244a24d0e1 -r d68cdbaa67ec archivers/pbzip2/Makefile
--- a/archivers/pbzip2/Makefile Sun Aug 28 12:36:42 2005 +0000
+++ b/archivers/pbzip2/Makefile Sun Aug 28 17:36:52 2005 +0000
@@ -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 @@
 
 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 -r e1244a24d0e1 -r d68cdbaa67ec archivers/pbzip2/files/Makefile
--- a/archivers/pbzip2/files/Makefile   Sun Aug 28 12:36:42 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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>