CPPFLAGS is now passed to MAKE_ENV and CONFIGURE_ENV by bsd.pkg.mk, so

adapt by moving CPPFLAGS settings to top-level, and removing explicit
inclusion of CPPFLAGS into MAKE_ENV and CONFIGURE_ENV.

11 files changed, 17 insertions, 23 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index 9d5cb8875a8..1f9c89e55b9 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/06/11 02:05:15 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/06/11 06:34:49 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -21,7 +21,6 @@ GNU_CONFIGURE=		yes
 .include "../../devel/readline/buildlink.mk"
 
 CONFIGURE_ARGS+=	--without-server --without-restore
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 # Prevent configure script from finding unnecessary libraries.  We'll patch
 # the amrecover Makefile to add the readline libraries as it's the only
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 37e686b5913..603b7efeef0 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/29 16:01:57 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:49 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -27,7 +27,7 @@ ADDUSER=		${LOCALBASE}/sbin/useradd
 ADDGROUP=		${LOCALBASE}/sbin/groupadd
 .endif
 .elif ${OPSYS} == "SunOS"
-MAKE_ENV+=		CPPFLAGS=-D_LARGEFILE64_SOURCE
+CPPFLAGS+=		-D_LARGEFILE64_SOURCE
 ADDUSER=		useradd
 ADDGROUP=		groupadd
 .endif
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 41db9418efd..b0c4b0b7a83 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/04/02 20:06:16 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:49 jlam Exp $
 #
 
 DISTNAME=		apcupsd-3.6.2
@@ -27,8 +27,6 @@ CONFIGURE_ARGS+=	--enable-http		# include http support
 CONFIGURE_ARGS+=	--with-catgets		# use catgets functions
 CONFIGURE_ARGS+=	--enable-nls		# i18n support
 
-CONFIGURE_ENV+=		CPFLAGS="${CPPFLAGS}"	# make sure libintl.h is found
-
 pre-configure:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf --force
 
diff --git a/sysutils/hfsutils/Makefile b/sysutils/hfsutils/Makefile
index c0938a0d0ab..0ab46ee9363 100644
--- a/sysutils/hfsutils/Makefile
+++ b/sysutils/hfsutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:42:14 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:50 jlam Exp $
 #
 
 DISTNAME=	hfsutils-3.2.6
@@ -12,7 +12,7 @@ COMMENT=	Command Line Interface HFS (not HFS+) disk access tools
 DEPENDS=	libhfs-3.2.6:../../devel/libhfs
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include/libhfs
+CPPFLAGS+=	-I${LOCALBASE}/include/libhfs
 
 ALL_TARGET=	all_cli
 INSTALL_TARGET=	install_cli
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index f2866c4e19a..d9c3b1b911e 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2001/05/14 15:39:30 atatat Exp $
+# $NetBSD: Makefile,v 1.44 2001/06/11 06:34:50 jlam Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp
 #
 
@@ -21,7 +21,7 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS=		-n ${LOWER_OPSYS}
 CONFIGURE_ENV+=		LSOF_CC="${CC} ${CFLAGS}"
-MAKE_ENV+=		CPPFLAGS="${CPPFLAGS} -DLSOF_MORE_SECURE=${LSOF_MORE_SECURE}"
+CPPFLAGS+=		-DLSOF_MORE_SECURE=${LSOF_MORE_SECURE}
 
 SRCBALL_NAME=		${DISTNAME:S/_W$//}
 
diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common
index 3ecad0e2926..4a9b0eda172 100644
--- a/sysutils/mc/Makefile.common
+++ b/sysutils/mc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2001/03/27 03:20:17 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.9 2001/06/11 06:34:50 jlam Exp $
 
 DISTNAME=		mc-4.5.51
 CATEGORIES+=		sysutils
@@ -35,7 +35,6 @@ CONFIGURE_ENV+=		ac_cv_header_readline_readline_h=no
 
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV+=		LOCALEDIR="${LOCALEDIR}"
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=		LIBS="${LIBS}"
 
 LIBS+=			-lm -ltermcap		# -lslang
diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index e1e4c7841fa..60c2bd893e3 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:50 jlam Exp $
 #
 
 DISTNAME=		medusa-0.5.1
@@ -19,6 +19,6 @@ USE_LIBTOOL=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=		-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index bf615b6181e..ebd3e52fc52 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/02/17 17:42:16 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2001/06/11 06:34:50 jlam Exp $
 #
 
 DISTNAME=	mtools-3.9.7
@@ -14,7 +14,6 @@ NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64	# LP64 problem
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 INFO_FILES=	mtools.info
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index ba43f9f722e..1237249b8cb 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/04/24 16:59:34 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:51 jlam Exp $
 
 DISTNAME=		psmisc-20.1
 CATEGORIES=		sysutils
@@ -21,7 +21,6 @@ DEPENDS+=		libgetopt>=1.3:../../devel/libgetopt
 EVAL_PREFIX+=		GETOPTDIR=libgetopt
 CPPFLAGS+=		-I${GETOPTDIR}/include
 LDFLAGS+=		-Wl,-R${GETOPTDIR} -L${GETOPTDIR} -lgetopt
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 .endif
 
 # "make install" doesn't install the link from killall -> pidof.
diff --git a/sysutils/xhfs/Makefile b/sysutils/xhfs/Makefile
index f27f13a9799..ad817563b9b 100644
--- a/sysutils/xhfs/Makefile
+++ b/sysutils/xhfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/05 19:51:19 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:51 jlam Exp $
 #
 
 DISTNAME=	hfsutils-3.2.6
@@ -18,6 +18,6 @@ USE_X11=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib \
 		--with-tk=${LOCALBASE}/lib --disable-cli
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include/libhfs
+CPPFLAGS+=	-I${LOCALBASE}/include/libhfs
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 0d1246e9869..e71928e5a1f 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/03/27 03:20:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.34 2001/06/11 06:34:51 jlam Exp $
 #
 
 DISTNAME=       xosview-1.7.0.b
@@ -23,8 +23,8 @@ BUILD_DEFS=	UVM
 .elif ${OPSYS} == "SunOS"
 BUILD_DEPENDS+=	egcs-1.1.2:../../lang/egcs
 CONFIGURE_ENV+=	CXX=${LOCALBASE}/egcs/bin/g++
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
 CONFIGURE_ENV+= LIBS="${LIBS} -lsocket -lnsl"
+CPPFLAGS+=	-I${X11BASE}/include
 USE_GMAKE=	YES
 .endif