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.

7 files changed, 9 insertions, 15 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index c2f817dd866..6d9dea019ef 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/06/11 02:05:10 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:30 jlam Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -35,7 +35,6 @@ ALL_TARGET=	compile canonical
 .include "../../graphics/png/buildlink.mk"
 
 OS_CFLAGS=	${CFLAGS}
-OS_CFLAGS+=	${BUILDLINK_CPPFLAGS}
 
 .if exists(/usr/include/inttypes.h)
 OS_CFLAGS+=	-DHAVE_INTTYPE_H=1
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index b5ba4ca1721..7670bd43bab 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 14:40:49 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:31 jlam Exp $
 #
 
 DISTNAME=	bvi-1.2.0.src
@@ -20,8 +20,8 @@ WRKSRC=		${WRKDIR}/${PKGNAME}
 .include "../../mk/bsd.prefs.mk"
 
 .if ${NEED_NCURSES} == "YES"
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 37873fd1f4e..c31f388ca86 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/02/16 14:40:53 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/06/11 06:34:31 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:55:09 gj Exp
 
 DISTNAME=		vile-9.0
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+=	--with-libdir-path=${FILTERDIR}
 # Until the source catches up to the current Perl API, we need PERL_POLLUTE
 # to look like an older perl.
 CPPFLAGS+=		-DPERL_POLLUTE=1
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 MAKEFILE=		makefile
 INSTALL_TARGET=		install install-perl
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index c0d7010881b..57a32dc73bb 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/02/16 14:40:54 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2001/06/11 06:34:31 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -36,7 +36,6 @@ post-install:
 CONFIGURE_ARGS+=	--with-tlib=ncurses
 CPPFLAGS+=		-I${LOCALBASE}/include	# for ncurses' termcap.h
 LDFLAGS+=		-L${LOCALBASE}/lib	# for -lncurses
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 .else
 CONFIGURE_ARGS+=	--with-tlib=curses
 .endif
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index b0cfc541857..5e066585951 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 14:40:54 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/06/11 06:34:31 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -34,7 +34,6 @@ post-install:
 CONFIGURE_ARGS+=	--with-tlib=ncurses
 CPPFLAGS+=		-I${LOCALBASE}/include	# for ncurses' termcap.h
 LDFLAGS+=		-L${LOCALBASE}/lib	# for -lncurses
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 .else
 CONFIGURE_ARGS+=	--with-tlib=curses
 .endif
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index d2f322cfd3f..b8c93784bd6 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2001/02/16 14:40:54 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2001/06/11 06:34:32 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -29,7 +29,6 @@ post-install:
 CONFIGURE_ARGS+=	--with-tlib=ncurses
 CPPFLAGS+=              -I${LOCALBASE}/include  # for ncurses' termcap.h
 LDFLAGS+=               -L${LOCALBASE}/lib      # for -lncurses
-CONFIGURE_ENV+=         CPPFLAGS="${CPPFLAGS}"
 .else
 CONFIGURE_ARGS+=	--with-tlib=curses
 .endif
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index f1f592c9d00..40d34182eef 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/02/16 14:40:56 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:32 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
 #
 
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+=	--with-libdir-path=${FILTERDIR}
 # Until the source catches up to the current Perl API, we need PERL_POLLUTE
 # to look like an older perl.
 CPPFLAGS+=		-DPERL_POLLUTE=1
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 MAKEFILE=		makefile
 INSTALL_TARGET=		install install-perl