diff options
| -rw-r--r-- | ham/hamlib/Makefile | 3 | ||||
| -rw-r--r-- | mail/drac/Makefile | 3 | ||||
| -rw-r--r-- | mk/tools.mk | 23 | ||||
| -rw-r--r-- | net/tcl-scotty/Makefile | 3 | ||||
| -rw-r--r-- | security/cfs/Makefile | 3 | ||||
| -rw-r--r-- | security/dsniff/Makefile | 3 | ||||
| -rw-r--r-- | security/nfsbug/Makefile | 3 |
7 files changed, 28 insertions, 13 deletions
diff --git a/ham/hamlib/Makefile b/ham/hamlib/Makefile index 420bec5c9e3..e7c71860f5d 100644 --- a/ham/hamlib/Makefile +++ b/ham/hamlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/11/23 11:21:07 wulf Exp $ +# $NetBSD: Makefile,v 1.12 2004/12/18 19:24:26 jlam Exp $ # DISTNAME= hamlib-1.2.3 @@ -14,7 +14,6 @@ USE_BUILDLINK3= yes USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_LIBTOOL= yes -NO_EXPORT_CPP= yes CONFIGURE_ARGS+=--without-tcl-binding \ --without-perl-binding diff --git a/mail/drac/Makefile b/mail/drac/Makefile index 00e2a0dafcc..e0ff5bab5ca 100644 --- a/mail/drac/Makefile +++ b/mail/drac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/04/25 01:05:18 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2004/12/18 19:24:26 jlam Exp $ # DISTNAME= drac @@ -14,7 +14,6 @@ COMMENT= Dynamic Relay Authorization Control WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGNAME_NOREV} USE_BUILDLINK3= YES -NO_EXPORT_CPP= YES MAKE_ENV+= MKDIR="${MKDIR}" MAKE_ENV+= INSTALL="${INSTALL}" diff --git a/mk/tools.mk b/mk/tools.mk index 3b74bbb8a74..f17c69d3c5a 100644 --- a/mk/tools.mk +++ b/mk/tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.mk,v 1.46 2004/11/02 22:24:35 wiz Exp $ +# $NetBSD: tools.mk,v 1.47 2004/12/18 19:24:26 jlam Exp $ # # This Makefile creates a ${TOOLS_DIR} directory and populates the bin # subdir with tools that hide the ones outside of ${TOOLS_DIR}. @@ -391,6 +391,27 @@ ${TOOLS_DIR}/bin/make: fi .endif +# Always create a ${TOOLS_DIR}/bin/rpcgen to wrap the real rpcgen. +# The wrapper will correctly set the CPP environment variable to a +# stat((2)able path to a C preprocessor, then rely on the PATH to +# find and invoke the real rpcgen. +# +override-tools: ${TOOLS_DIR}/bin/rpcgen +.if !target(${TOOLS_DIR}/bin/rpcgen) +${TOOLS_DIR}/bin/rpcgen: + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} + ${_PKG_SILENT}${_PKG_DEBUG} \ + ( ${ECHO} '#!${TOOLS_SHELL}'; \ + ${ECHO} 'wrapperlog="$${TOOLS_WRAPPER_LOG-${_TOOLS_WRAP_LOG}}"'; \ + ${ECHO} 'CPP="${WRAPPER_BINDIR}/cpp"; export CPP'; \ + PATH=`${ECHO} "${PATH}" | ${SED} -e "s,.*${.TARGET:H}:,,"`; \ + ${ECHO} "PATH=\"$$PATH\"; export PATH"; \ + ${ECHO} '${ECHO} "<.> rpcgen $$*" >> $$wrapperlog'; \ + ${ECHO} 'rpcgen "$$@"'; \ + ) > ${.TARGET} + ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} +.endif + .if defined(USE_TBL) && !empty(USE_TBL:M[yY][eE][sS]) . if exists(/usr/bin/tbl) _TOOLS_PROGNAME.tbl= /usr/bin/tbl diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile index 9be8bcae37c..d2d3fdf2f48 100644 --- a/net/tcl-scotty/Makefile +++ b/net/tcl-scotty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/10/03 00:18:00 tv Exp $ +# $NetBSD: Makefile,v 1.17 2004/12/18 19:24:26 jlam Exp $ # DISTNAME= scotty-${DIST_VERS} @@ -26,7 +26,6 @@ CONFIGURE_ARGS+=--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib \ CONFIGURE_ENV+= TARGET=scotty USE_LIBTOOL= yes -NO_EXPORT_CPP= yes .include "../../lang/tcl/buildlink3.mk" diff --git a/security/cfs/Makefile b/security/cfs/Makefile index c7bb8ff5ff3..856649ed432 100644 --- a/security/cfs/Makefile +++ b/security/cfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/12/03 15:15:07 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2004/12/18 19:24:26 jlam Exp $ DISTNAME= cfs-1.4.1 PKGREVISION= 3 @@ -11,7 +11,6 @@ COMMENT= Encrypting file system, using NFS as its interface USE_BUILDLINK3= YES USE_PKGINSTALL= YES -NO_EXPORT_CPP= YES CRYPTO= # defined diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile index d8b1db29d48..fb005687bf3 100644 --- a/security/dsniff/Makefile +++ b/security/dsniff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/10/03 00:18:08 tv Exp $ +# $NetBSD: Makefile,v 1.21 2004/12/18 19:24:26 jlam Exp $ # $OpenBSD: Makefile,v 1.13 2000/06/19 18:38:55 dugsong Exp $ DISTNAME= dsniff-2.3 @@ -13,7 +13,6 @@ COMMENT= Password sniffer USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_X11= yes -NO_EXPORT_CPP= yes .include "../../net/libpcap/buildlink3.mk" .include "../../devel/libnet/buildlink3.mk" diff --git a/security/nfsbug/Makefile b/security/nfsbug/Makefile index 4caa0e56365..648d8a93037 100644 --- a/security/nfsbug/Makefile +++ b/security/nfsbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/10/01 10:37:33 grant Exp $ +# $NetBSD: Makefile,v 1.12 2004/12/18 19:24:26 jlam Exp $ DISTNAME= nfsshell-1.0 CATEGORIES= net security @@ -13,7 +13,6 @@ EXTRACT_ONLY= nfsBugFerret.tgz WRKSRC= ${WRKDIR}/nfsbug USE_BUILDLINK3= yes -NO_EXPORT_CPP= yes # needed since we use rpcgen # Only works on 1.5B or greater on most platforms but will work on any x86 # since struct pmap didn't get exposed through vm.h there. |