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.

5 files changed, 8 insertions, 10 deletions

diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 02135785a87..5b9e1c36a62 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 18:08:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:44 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/11/17 09:05:15 obrien Exp
 
 DISTNAME=       buffer-1.17
@@ -13,7 +13,7 @@ COMMENT=	buffer sporadic binary I/O for faster tape use
 
 .if ${OPSYS} == "SunOS"
 CPPFLAGS+=	-DSYS5
-MAKE_ENV+=	CC="${CC}" CPPFLAGS="${CPPFLAGS}"
+MAKE_ENV+=	CC="${CC}"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/dt/Makefile b/misc/dt/Makefile
index e16f24ecab9..aea4f58d46f 100644
--- a/misc/dt/Makefile
+++ b/misc/dt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/17 18:08:59 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:44 jlam Exp $
 #
 
 DISTNAME=	dt-1.1.7
@@ -16,7 +16,6 @@ IGNORE=		"${PKGNAME} is only useful for mac68k!"
 
 ALL_TARGET=	depend all
 CPPFLAGS+=	-D${DT_LAYOUT}_LAYOUT
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 DTDOCSDIR=	${PREFIX}/share/doc/dt
 WRKSRC=		${WRKDIR}/dt
diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index 59668e5dc5b..a945d040b09 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/04/07 19:23:54 rh Exp $
+# $NetBSD: Makefile,v 1.28 2001/06/11 06:34:44 jlam Exp $
 #
 
 DISTNAME=		gnome-pim-1.4.0
@@ -17,7 +17,7 @@ USE_LIBTOOL=		YES
 USE_X11BASE=		YES
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ENV+=		LOCALEDIR=${LOCALEDIR}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index fc081962f54..047139f7539 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile,v 1.34 2001/04/08 06:23:57 rh Exp $
+## $NetBSD: Makefile,v 1.35 2001/06/11 06:34:45 jlam Exp $
 
 DISTNAME=		gnome-utils-1.4.0
 CATEGORIES=		misc x11 gnome
@@ -32,7 +32,7 @@ pre-configure:
 
 .if ${NEED_NCURSES} == "YES"
 CONFIGURE_ARGS+=	--with-ncurses=${LOCALBASE}
-CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+=		-I${LOCALBASE}/include
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index ad1eb91b512..8a3d67b89c9 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/02 20:05:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:45 jlam Exp $
 #
 
 DISTNAME=		pinfo-0.6.0
@@ -16,7 +16,6 @@ GNU_CONFIGURE=		yes
 USE_LIBINTL=		yes
 
 CPPFLAGS+=		-DDFLT_INFOPATH='\"/usr/share/info:${X11BASE}/info:${LOCALBASE}/info:/usr/local/info\"'
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/pinforc ${PREFIX}/share/examples/