summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-06-11 06:34:17 +0000
committerjlam <jlam@pkgsrc.org>2001-06-11 06:34:17 +0000
commitc4e71c5e7a56600bcceba68cbed656ef7246e444 (patch)
tree6b373d2a314b8d27a2d1f47c4cb173dc5c0d7a48
parenta057ade2a392070aecc8ee511ae1cab01869b513 (diff)
downloadpkgsrc-c4e71c5e7a56600bcceba68cbed656ef7246e444.tar.gz
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.
-rw-r--r--archivers/lzop/Makefile4
-rw-r--r--audio/csound-bath/Makefile4
-rw-r--r--audio/gdcd/Makefile3
-rw-r--r--audio/gnome-media/Makefile4
-rw-r--r--audio/gqmpeg/Makefile4
-rw-r--r--audio/mikmod/Makefile4
-rw-r--r--audio/mpg123/Makefile4
-rw-r--r--audio/rosegarden/Makefile4
-rw-r--r--audio/rplay/Makefile3
-rw-r--r--audio/xmms-crossfade/Makefile3
-rw-r--r--audio/xmms/Makefile3
-rw-r--r--cad/gwave/Makefile3
-rw-r--r--cad/ng-spice/Makefile3
-rw-r--r--cad/verilog-current/Makefile3
-rw-r--r--cad/verilog/Makefile3
-rw-r--r--cad/vipec/Makefile5
-rw-r--r--chat/fugu/Makefile6
-rw-r--r--chat/gaim/Makefile4
-rw-r--r--chat/gale/Makefile4
-rw-r--r--chat/gnomeicu/Makefile3
-rw-r--r--chat/kicq/Makefile3
-rw-r--r--chat/kxicq/Makefile3
-rw-r--r--chat/xchat/Makefile4
-rw-r--r--comms/plptools/Makefile3
-rw-r--r--comms/qpage/Makefile8
-rw-r--r--converters/psiconv/Makefile6
-rw-r--r--converters/wv/Makefile4
-rw-r--r--converters/xdeview/Makefile7
-rw-r--r--cross/bfd-crunchide/Makefile4
-rw-r--r--cross/bfd-mdsetimage/Makefile4
-rw-r--r--databases/gq/Makefile4
-rw-r--r--databases/gtranscript/Makefile3
-rw-r--r--databases/mysql-client/Makefile.common3
-rw-r--r--databases/openldap/Makefile4
-rw-r--r--databases/postgresql/Makefile.common3
-rw-r--r--databases/rrdtool/Makefile3
-rw-r--r--devel/GConf/Makefile4
-rw-r--r--devel/SDL/Makefile4
-rw-r--r--devel/bison/Makefile3
-rw-r--r--devel/bonobo/Makefile4
-rw-r--r--devel/cdk/Makefile3
-rw-r--r--devel/gettext/Makefile6
-rw-r--r--devel/glib/Makefile4
-rw-r--r--devel/isect/Makefile3
-rw-r--r--devel/libglade/Makefile4
-rw-r--r--devel/libgtop/Makefile3
-rw-r--r--devel/libhfs/Makefile4
-rw-r--r--devel/libsmi/Makefile3
-rw-r--r--devel/maketool/Makefile4
-rw-r--r--devel/netcdf/Makefile4
-rw-r--r--devel/oaf/Makefile4
-rw-r--r--devel/rpc2/Makefile3
-rw-r--r--devel/sdcc/Makefile3
-rw-r--r--devel/stlport/Makefile3
-rw-r--r--devel/tvision/Makefile4
-rw-r--r--devel/xdelta/Makefile6
-rw-r--r--editors/abiword/Makefile3
-rw-r--r--editors/bvi/Makefile6
-rw-r--r--editors/vile/Makefile3
-rw-r--r--editors/vim-gtk/Makefile3
-rw-r--r--editors/vim-xaw/Makefile3
-rw-r--r--editors/vim/Makefile3
-rw-r--r--editors/xvile/Makefile3
-rw-r--r--emulators/gpsim/Makefile3
-rw-r--r--emulators/uae/Makefile3
-rw-r--r--finance/gnucash/Makefile3
-rw-r--r--games/baduki/Makefile3
-rw-r--r--games/clanbomber/Makefile3
-rw-r--r--games/freeciv-share/Makefile.common3
-rw-r--r--games/pacman/Makefile3
-rw-r--r--games/plib/Makefile3
-rw-r--r--games/xboard/Makefile3
-rw-r--r--games/xgalaga/Makefile4
-rw-r--r--games/xracer/Makefile3
-rw-r--r--graphics/avifile/Makefile4
-rw-r--r--graphics/fly/Makefile3
-rw-r--r--graphics/freetype-lib/Makefile.common3
-rw-r--r--graphics/gd/Makefile3
-rw-r--r--graphics/gdk-pixbuf/Makefile.common3
-rw-r--r--graphics/geomview/Makefile4
-rw-r--r--graphics/gif2png/Makefile3
-rw-r--r--graphics/gimp/Makefile5
-rw-r--r--graphics/gnome-iconedit/Makefile3
-rw-r--r--graphics/gphoto/Makefile3
-rw-r--r--graphics/gqview/Makefile4
-rw-r--r--graphics/imlib/Makefile3
-rw-r--r--graphics/libgdgeda/Makefile4
-rw-r--r--graphics/librsvg/Makefile4
-rw-r--r--graphics/opendis/Makefile3
-rw-r--r--graphics/plotutils/Makefile3
-rw-r--r--graphics/sane-backends/Makefile4
-rw-r--r--graphics/xsane/Makefile7
-rw-r--r--lang/a60/Makefile3
-rw-r--r--lang/gb/Makefile4
-rw-r--r--lang/kaffe/Makefile3
-rw-r--r--lang/librep/Makefile3
-rw-r--r--lang/squeak/Makefile3
-rw-r--r--lang/swi-prolog/Makefile3
-rw-r--r--mail/balsa/Makefile4
-rw-r--r--mail/cyrus-imapd/Makefile3
-rw-r--r--mail/mutt-devel/Makefile5
-rw-r--r--mail/mutt/Makefile5
-rw-r--r--mail/xbuffy/Makefile3
-rw-r--r--math/R/Makefile3
-rw-r--r--math/aribas/Makefile4
-rw-r--r--math/capc-calc/Makefile5
-rw-r--r--math/geg/Makefile4
-rw-r--r--math/gnumeric/Makefile4
-rw-r--r--math/octave/Makefile4
-rw-r--r--math/pspp/Makefile3
-rw-r--r--math/udunits/Makefile3
-rw-r--r--mbone/vat/Makefile3
-rw-r--r--misc/buffer/Makefile4
-rw-r--r--misc/dt/Makefile3
-rw-r--r--misc/gnome-pim/Makefile4
-rw-r--r--misc/gnome-utils/Makefile4
-rw-r--r--misc/pinfo/Makefile3
-rw-r--r--net/ORBit/Makefile5
-rw-r--r--net/gnubile/Makefile4
-rw-r--r--net/irrd/Makefile3
-rw-r--r--net/kdenetwork/Makefile3
-rw-r--r--net/mtr/Makefile4
-rw-r--r--net/nap/Makefile4
-rw-r--r--net/ncftp2/Makefile3
-rw-r--r--net/ntop/Makefile3
-rw-r--r--net/samba/Makefile4
-rw-r--r--net/tn5250/Makefile3
-rw-r--r--net/trafshow/Makefile4
-rw-r--r--net/zebra/Makefile3
-rw-r--r--net/zephyr/Makefile4
-rw-r--r--print/gnome-print/Makefile3
-rw-r--r--print/xpp/Makefile3
-rw-r--r--security/mcrypt/Makefile3
-rw-r--r--security/pam-ldap/Makefile4
-rw-r--r--security/racoon/Makefile7
-rw-r--r--security/srp_client/Makefile3
-rw-r--r--sysutils/amanda-client/Makefile3
-rw-r--r--sysutils/amanda-common/Makefile4
-rw-r--r--sysutils/apcupsd/Makefile4
-rw-r--r--sysutils/hfsutils/Makefile4
-rw-r--r--sysutils/lsof/Makefile4
-rw-r--r--sysutils/mc/Makefile.common3
-rw-r--r--sysutils/medusa/Makefile4
-rw-r--r--sysutils/mtools/Makefile3
-rw-r--r--sysutils/psmisc/Makefile3
-rw-r--r--sysutils/xhfs/Makefile4
-rw-r--r--sysutils/xosview/Makefile4
-rw-r--r--textproc/catdoc/Makefile3
-rw-r--r--textproc/icu/Makefile4
-rw-r--r--textproc/libxml/Makefile3
-rw-r--r--textproc/urlview/Makefile3
-rw-r--r--time/sunclock/Makefile4
-rw-r--r--wm/enlightenment/Makefile3
-rw-r--r--wm/flwm/Makefile4
-rw-r--r--wm/icewm/Makefile.common3
-rw-r--r--wm/wmakerconf/Makefile3
-rw-r--r--wm/wmx-current/Makefile.common4
-rw-r--r--www/Mosaic/Makefile3
-rw-r--r--www/arena/Makefile4
-rw-r--r--www/bozohttpd/Makefile3
-rw-r--r--www/gtkhtml/Makefile4
-rw-r--r--www/htdig/Makefile4
-rw-r--r--www/htmldoc/Makefile6
-rw-r--r--www/kannel/Makefile6
-rw-r--r--www/lynx-current/Makefile3
-rw-r--r--www/lynx/Makefile4
-rw-r--r--www/php3/Makefile4
-rw-r--r--www/php4/Makefile.common3
-rw-r--r--www/wml/Makefile3
-rw-r--r--x11/controlcenter/Makefile3
-rw-r--r--x11/fltk/Makefile3
-rw-r--r--x11/fox/Makefile4
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/gnome-applets/Makefile3
-rw-r--r--x11/gnome-core/Makefile3
-rw-r--r--x11/gnome-libs/Makefile5
-rw-r--r--x11/gtk/Makefile4
-rw-r--r--x11/wmfire/Makefile4
-rw-r--r--x11/wmfstatus/Makefile3
-rw-r--r--x11/wxGTK/Makefile3
-rw-r--r--x11/xfce/Makefile4
-rw-r--r--x11/xmountains/Makefile4
-rw-r--r--x11/xteddy2/Makefile4
183 files changed, 274 insertions, 398 deletions
diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile
index b676b5995d4..09b9fd445f8 100644
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 13:15:33 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:17 jlam Exp $
#
DISTNAME= lzop-1.00
@@ -12,6 +12,6 @@ COMMENT= Fast file compressor similar to gzip, using the LZO library
DEPENDS= liblzo-*:../../archivers/liblzo
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include"
+CPPFLAGS+= -I${PREFIX}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound-bath/Makefile b/audio/csound-bath/Makefile
index bac45aaf7b3..8e169dd6919 100644
--- a/audio/csound-bath/Makefile
+++ b/audio/csound-bath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 17:17:16 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:17 jlam Exp $
#
DISTNAME= Csound4.12
@@ -16,8 +16,6 @@ NO_SRC_ON_CDROM= "no for-fee-redistribution"
NO_BIN_ON_CDROM= ${NO_SRC_ON_CDROM}
DIST_SUBDIR= csound
-MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
CONFLICTS= csound-4*
#pre-build:
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index 10014edc095..c13370292c6 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/14 17:09:14 rh Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:17 jlam Exp $
#
DISTNAME= gdcd-0.2.1
@@ -15,7 +15,6 @@ DEPENDS+= libcdaudio>0.99.4:../../audio/libcdaudio
USE_X11BASE= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
# for pth and libcdaudio
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index bb8f65d48c2..569fb95a52d 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:18 jlam Exp $
DISTNAME= gnome-media-1.2.0
CATEGORIES= audio gnome
@@ -15,6 +15,6 @@ USE_LIBTOOL= YES
USE_X11BASE= YES
CONFIGURE_ENV+= XGETTEXT="${LOCALBASE}/bin/xgettext"
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index b0938e508d5..ab91c953946 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/03/27 03:19:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.34 2001/06/11 06:34:18 jlam Exp $
# FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp
DISTNAME= gqmpeg-0.8.3
@@ -22,7 +22,7 @@ USE_X11BASE= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --without-included-gettext
CONFIGURE_ARGS+= --enable-japanese
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" PKGLOCALEDIR="${PKGLOCALEDIR}"
+CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index deae0eea25a..be33ec67e90 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/02/16 13:30:47 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2001/06/11 06:34:18 jlam Exp $
#
DISTNAME= mikmod-3.1.6-a
@@ -19,6 +19,4 @@ REPLACE_NCURSES= ${WRKSRC}/configure
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 6ec2935ea10..c8399a9e28d 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/02/16 13:30:47 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2001/06/11 06:34:18 jlam Exp $
#
DISTNAME= mpg123-0.59r
@@ -39,7 +39,7 @@ ALL_TARGET= solaris-gcc
.endif
.if defined(USE_INET6) && ${USE_INET6} == "YES"
-MAKE_ENV+= CPPFLAGS="-DINET6"
+CPPFLAGS+= -DINET6
.endif
MAKE_FLAGS+= PREFIX="${PREFIX}"
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 9d67c3174b4..e12a3ab0fae 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/05/31 16:46:24 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:19 jlam Exp $
DISTNAME= rosegarden-2.1pl2
PKGNAME= rosegarden-2.1p2
@@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.bath.ac.uk/~masjpf/rose.html
COMMENT= notation editor & midi sequencer
-CONFIGURE_ENV+= CPPFLAGS=-I${PREFIX}/include
+CPPFLAGS+= -I${PREFIX}/include
GNU_CONFIGURE= YES
USE_GMAKE= yes
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index d24a31f46ab..d3654a1f7c2 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/05/22 04:33:12 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/06/11 06:34:19 jlam Exp $
# FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
#
@@ -19,7 +19,6 @@ DEPENDS+= rx-1.5:../../devel/rx
USE_LIBTOOL= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ENV+= RPLAY_TARGET=generic # XXX generic, or oss, or sun?
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include # for gsm.h and rxposix.h
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index bb04860ff1b..cb0609e0573 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:19 jlam Exp $
#
DISTNAME= xmms-crossfade-0.2.7
@@ -20,6 +20,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
LDFLAGS+= -lossaudio
CPPFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 7714a2715cd..0468d449e7e 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/05/20 20:52:24 rh Exp $
+# $NetBSD: Makefile,v 1.19 2001/06/11 06:34:19 jlam Exp $
# FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
DISTNAME= xmms-1.2.4
@@ -23,7 +23,6 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= XML_CONFIG="${LOCALBASE}/bin/xml-config"
CONFIGURE_ARGS+=--without-gnome
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index 10ec17519d7..9597833cacd 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 13:46:23 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:19 jlam Exp $
#
DISTNAME= gwave-20001123
@@ -16,7 +16,6 @@ GNU_CONFIGURE= YES
# LDFLAGS to get -lreadline
# CPPFLAGS to get -I${LOCALBASE}/include for readline/readline.h
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS+="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
post-extract:
${CP} ${FILESDIR}/sp2sp.1 ${WRKSRC}/doc/sp2sp.1
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index 1c881122101..072e327cbb4 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:46:26 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:20 jlam Exp $
#
DISTNAME= ng-spice-rework-13
@@ -23,7 +23,6 @@ REPLACE_NCURSES= configure configure.in
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-debug
LDFLAGS+= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
-CONFIGURE_ENV+= LDFLAGS+="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
CONFLICTS+= spice-*
diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile
index feb8ece752e..c362ca41675 100644
--- a/cad/verilog-current/Makefile
+++ b/cad/verilog-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/05/21 22:25:19 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.19 2001/06/11 06:34:20 jlam Exp $
#
DISTNAME= verilog-20010520
@@ -19,6 +19,5 @@ CONFLICTS+= verilog-[0-9]*
GNU_CONFIGURE= yes
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS+="${LDFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile
index 4d47dc334c9..095e0804b47 100644
--- a/cad/verilog/Makefile
+++ b/cad/verilog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/04/11 13:36:19 wennmach Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:20 jlam Exp $
#
DISTNAME= verilog-0.4
@@ -19,6 +19,5 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
# to find ipal.h:
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS+="${LDFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index ac97f42a921..29d5a9c8c75 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/02/16 13:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2001/06/11 06:34:20 jlam Exp $
#
DISTNAME= vipec-2.0.4
@@ -20,8 +20,7 @@ EVAL_PREFIX+= QT2DIR=qt2-libs
# make sure configure finds png
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV+= "QTDIR=${QT2DIR}/qt2" \
- USER_LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" \
- CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
+ USER_LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS+= "--with-qt-dir=${QT2DIR}/qt2"
post-patch:
diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile
index e11a57f3cb0..ab13f349643 100644
--- a/chat/fugu/Makefile
+++ b/chat/fugu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/16 21:00:26 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:20 jlam Exp $
#
DISTNAME= fugu-1.0
@@ -13,7 +13,7 @@ DEPENDS+= rsaref-2.0p3:../../security/rsaref/
DEPENDS+= py-Pmw>=0.8.5:../../x11/py-Pmw/
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/rsaref"
+LDFLAGS+= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/rsaref
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index d11725ab0db..6bd9fc4cf3a 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/06/05 22:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:21 jlam Exp $
#
DISTNAME= gaim-0.11.0pre11
@@ -18,6 +18,6 @@ USE_X11BASE= YES
GNU_CONFIGURE= YES
# for pthread.h
-CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index bf457ce6da2..926ed9d44ea 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 13:51:23 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:21 jlam Exp $
#
DISTNAME= gale-0.99a
@@ -40,7 +40,7 @@ INSTALL_FILE= ${WRKDIR}/INSTALL
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/rsaref -I${LOCALBASE}/include/w3c-libwww"
+CPPFLAGS+= -I${LOCALBASE}/include/rsaref -I${LOCALBASE}/include/w3c-libwww
GALE_USER= gale
GALE_GROUP= gale
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 7da0f187183..b9bf9f4fd5b 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/26 21:21:18 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:21 jlam Exp $
DISTNAME= gnomeicu-0.96
CATEGORIES= chat gnome
@@ -18,7 +18,6 @@ USE_X11BASE= YES
USE_GMAKE= YES
USE_LIBINTL= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -liconv
diff --git a/chat/kicq/Makefile b/chat/kicq/Makefile
index 95580c56492..3d2526f64f7 100644
--- a/chat/kicq/Makefile
+++ b/chat/kicq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:21 jlam Exp $
DISTNAME= kicq-1.0.0
CATEGORIES= chat kde
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --datadir=${KDEBASEDIR}/share/kde \
--with-icq-includes=${LOCALBASE}/include \
--with-icq-libs=${LOCALBASE}/lib
CONFIGURE_ENV+= KDEDIR=${KDEBASEDIR} \
- CPPFLAGS="${CPPFLAGS}" \
CXXFLAGS="${CFLAGS}" \
all_libraries="-Wl,-R${QT1DIR}/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz"
diff --git a/chat/kxicq/Makefile b/chat/kxicq/Makefile
index 8c601c1f42f..e7ebc533192 100644
--- a/chat/kxicq/Makefile
+++ b/chat/kxicq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:51:29 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:21 jlam Exp $
DISTNAME= kxicq-03132000
CATEGORIES= chat kde
@@ -21,7 +21,6 @@ EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase
CONFIGURE_ARGS+= --datadir=${KDEBASEDIR}/share/kde \
--with-qt-dir=${QT1DIR}/qt1
CONFIGURE_ENV+= KDEDIR=${KDEBASEDIR} \
- CPPFLAGS="${CPPFLAGS}" \
CXXFLAGS="${CFLAGS}" \
all_libraries="-Wl,-R${QT1DIR}/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz"
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 70f7d2b69bf..84a5b288144 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/23 19:17:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:22 jlam Exp $
DISTNAME= xchat-1.6.2
CATEGORIES= chat x11 gnome
@@ -16,7 +16,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_X11BASE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
pre-configure:
@${TOUCH} ${WRKSRC}/stamp-h.in
diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile
index b7e14df7c98..edd6c7a6b31 100644
--- a/comms/plptools/Makefile
+++ b/comms/plptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/06/11 02:05:08 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/06/11 06:34:22 jlam Exp $
#
DISTNAME= plptools-0.6
@@ -19,7 +19,6 @@ USE_GNU_READLINE= # uses rl_filename_quoting_desired flag
.include "../../devel/readline/buildlink.mk"
CONFIGURE_ARGS+= --with-serial=${DEFAULT_SERIAL_DEVICE}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LIBS="${LIBS}"
LIBS+= -ltermcap
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index c57098d1d4f..37676a7cc9a 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 13:56:23 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:22 jlam Exp $
#
DISTNAME= qpage-3.3
@@ -14,8 +14,8 @@ ONLY_FOR_PLATFORM= SunOS-*-* # untested on NetBSD
GNU_CONFIGURE= yes
-MAKE_ENV+= CPPFLAGS="`${AWK} -F: '/^uucp:/ { \
- printf(\"-DDAEMONUSER=%s -DDAEMONGROUP=%s\", $$3, $$4); }' \
- /etc/passwd`"
+CPPFLAGS+= `${AWK} -F: '/^uucp:/ { \
+ printf(\"-DDAEMONUSER=%s -DDAEMONGROUP=%s\", $$3, $$4); }' \
+ /etc/passwd`
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 24399d7770a..e7b181c3f99 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:22 jlam Exp $
#
DISTNAME= psiconv-0.6.1
@@ -21,8 +21,8 @@ USE_X11= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="`${MAGICK_CONFIG} --cppflags` -DIMAGEMAGICK" \
- LIBS="${LIBS} `${MAGICK_CONFIG} --libs`"
+CONFIGURE_ENV+= LIBS="${LIBS} `${MAGICK_CONFIG} --libs`"
+CPPFLAGS+= `${MAGICK_CONFIG} --cppflags` -DIMAGEMAGICK"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/psiconv
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 0d2c182b668..9ced6ad5754 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 13:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:23 jlam Exp $
#
DISTNAME= wv-0.6.0
@@ -27,13 +27,11 @@ CONFIGURE_ARGS+= --with-png=${LOCALBASE}
CONFIGURE_ARGS+= --with-ttf=${LOCALBASE}
CONFIGURE_ARGS+= --with-wmf=${LOCALBASE}
CONFIGURE_ARGS+= --with-xpm=${XPMDIR}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
MAKE_ENV+= RM="${RM} -f"
CPPFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include/magick
CPPFLAGS+= -I${LOCALBASE}/include/libwmf
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
pre-patch:
${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} {} \;
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 1bf0d7a04d4..09092bc5f7c 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/06/10 17:41:01 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/06/11 06:34:23 jlam Exp $
#
DISTNAME= uudeview-0.5.15
@@ -17,9 +17,8 @@ USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-tcl="${LOCALBASE}" --enable-tk="${LOCALBASE}"
# Season to taste --- anything over tcl7.5
-CONFIGURE_ENV= LDFLAGS=-s\
- CPPFLAGS="-I${LOCALBASE}/include/ \
- -I${LOCALBASE}/include/"
+LDFLAGS+= -s
+CPPFLAGS+= -I${LOCALBASE}/include
ALL_TARGET= xdeview
INSTALL_TARGET= install-tcl
diff --git a/cross/bfd-crunchide/Makefile b/cross/bfd-crunchide/Makefile
index 3b6fe3a5706..de83f6707b8 100644
--- a/cross/bfd-crunchide/Makefile
+++ b/cross/bfd-crunchide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/03/23 13:36:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:23 jlam Exp $
DISTNAME= bfd-crunchide-1.1
CATEGORIES= cross
@@ -18,8 +18,8 @@ NO_CONFIGURE= yes
USE_CROSSBASE= yes
BFD_VERSION= 2.9.1
+CPPFLAGS+= -I${PREFIX}/include
MAKE_ENV+= BFD_VERSION=${BFD_VERSION} \
- CPPFLAGS="-I${PREFIX}/include" \
LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty"
do-extract:
diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile
index 220c735f835..79f2923a1a1 100644
--- a/cross/bfd-mdsetimage/Makefile
+++ b/cross/bfd-mdsetimage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/03/23 13:02:39 sakamoto Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:23 jlam Exp $
DISTNAME= bfd-mdsetimage-1.15.1
CATEGORIES= cross
@@ -18,8 +18,8 @@ NO_CONFIGURE= yes
USE_CROSSBASE= yes
BFD_VERSION= 2.9.1
+CPPFLAGS+= -I${PREFIX}/include
MAKE_ENV+= BFD_VERSION=${BFD_VERSION} \
- CPPFLAGS="-I${PREFIX}/include" \
LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty"
do-extract:
diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index 0541c8b74a9..c66f0a5b05e 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 14:17:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:23 jlam Exp $
#
DISTNAME= gq-0.3.0
@@ -15,6 +15,6 @@ DEPENDS+= gtk+>=1.2.8:../../x11/gtk
USE_X11BASE= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/gtranscript/Makefile b/databases/gtranscript/Makefile
index 57ea565f810..6a04302ca69 100644
--- a/databases/gtranscript/Makefile
+++ b/databases/gtranscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/14 15:04:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:24 jlam Exp $
#
DISTNAME= gtranscript-0.0.1
@@ -23,7 +23,6 @@ DEPENDS+= postgresql-{6.5.3*,7.0*,lib-*}:../../databases/postgresql-lib
GNU_CONFIGURE= YES
USE_X11BASE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include # pgsql/*.h
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index 96223c22380..6dc7ab51a58 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2001/05/02 08:22:28 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2001/06/11 06:34:24 jlam Exp $
DISTNAME= mysql-3.23.35
CATEGORIES= databases
@@ -16,7 +16,6 @@ EXTRACT_USING_PAX= # defined
MYSQL_DATADIR?= /var/mysql
GNU_CONFIGURE= # defined
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR}
CONFIGURE_ARGS+= --with-named-z-libs=z
CONFIGURE_ARGS+= --with-libwrap
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index d5c2d1d8c76..8d6f5fab6ec 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/05/14 16:15:52 kleink Exp $
+# $NetBSD: Makefile,v 1.23 2001/06/11 06:34:24 jlam Exp $
#
DISTNAME= openldap-1.2.12
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --enable-wrappers
.if ${OPSYS} == "SunOS"
DEPENDS+= db-2.7.7:../../databases/db
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/db2"
+CPPFLAGS+= -I${LOCALBASE}/include/db2
CONFIGURE_ENV+= LIBS="-ldb2 -lpthread -lrt"
.endif
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index feb35a49a81..4ff1c136145 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2001/06/11 02:05:08 jlam Exp $
+# $NetBSD: Makefile.common,v 1.20 2001/06/11 06:34:24 jlam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution.
@@ -75,7 +75,6 @@ CONFIGURE_ARGS+= --enable-syslog
CONFIGURE_ARGS+= --with-CXX
CONFIGURE_ARGS+= --with-template="${LOWER_OPSYS}"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LIBS="${LIBS}"
MAKE_ENV+= CUSTOM_COPT="${CFLAGS}"
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 9ff9ae98d9e..c0d251131a2 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/06 01:09:34 fredb Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:24 jlam Exp $
#
DISTNAME= rrdtool-1.0.28
@@ -24,7 +24,6 @@ GNU_CONFIGURE= # defined
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ARGS= --enable-shared
MAKE_ENV+= X11BASE=${X11BASE} X11PREFIX=${X11PREFIX}
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 2b540fa853a..e68e0e68df0 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/04/19 13:04:02 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:25 jlam Exp $
#
DISTNAME= GConf-1.0.0
@@ -19,7 +19,7 @@ USE_LIBINTL= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11PREFIX}/include"
+CPPFLAGS+= -I${X11PREFIX}/include
PLIST_SUBST+= LOCALBASE=${LOCALBASE}
post-install:
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 879487e7b07..0735aea8635 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/05/06 12:48:56 rh Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:25 jlam Exp $
#
DISTNAME= SDL-1.2.0
@@ -38,9 +38,9 @@ CONFIGURE_ARGS+= --disable-nas
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CONFIGURE_ARGS+= --disable-pthread-sem
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -D_POSIX_THREAD_SYSCALL_SOFT=1"
CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS}"
MAKE_ENV+= NASMFLAGS="${NASMFLAGS}"
+CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
LDFLAGS+= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
#CC= ${LOCALBASE}/pthreads/bin/pgcc
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 0aa62da77eb..6948638d408 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/03/27 03:19:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.21 2001/06/11 06:34:25 jlam Exp $
DISTNAME= bison-1.28
CATEGORIES= devel
@@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= yes
USE_LIBINTL= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --without-included-gettext
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
CPPFLAGS+= -Dunix # for $TMPDIR parsing
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 415be5dfd83..4a66e7118db 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/22 05:53:21 rh Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:26 jlam Exp $
#
DISTNAME= bonobo-1.0.4
@@ -21,9 +21,9 @@ USE_X11BASE= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
CONFIGURE_ENV+= X11BASE="${X11BASE}"
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 976414f4e73..93eec495281 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/05/17 08:38:42 abs Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:26 jlam Exp $
#
DISTNAME= latestCDK
@@ -17,7 +17,6 @@ BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include # for ncurses.h
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
ALL_TARGET= default
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 5ecd717b4f1..562828f982b 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/02/26 20:19:43 tron Exp $
+# $NetBSD: Makefile,v 1.29 2001/06/11 06:34:26 jlam Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
#
@@ -15,8 +15,8 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_LIBINTL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
INFO_FILES= gettext.info
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 47e13c9dcc5..a47d5e29a26 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/04/27 11:46:34 tron Exp $
+# $NetBSD: Makefile,v 1.31 2001/06/11 06:34:27 jlam Exp $
# FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
#
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
INFO_FILES= glib.info
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index a48372d86b5..fce31aa65c4 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 14:38:31 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:27 jlam Exp $
#
DISTNAME= isect-1.0
@@ -16,7 +16,6 @@ USE_LIBTOOL= yes
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
CPPFLAGS+= -I${LOCALBASE}/include # for w3c-libwww/WWWlib.h
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
DOCDIR= ${PREFIX}/share/doc/isect
EGDIR= ${PREFIX}/share/examples/isect
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 56d8a2d7558..fabb4d67726 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/04/02 20:06:12 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2001/06/11 06:34:28 jlam Exp $
#
DISTNAME= libglade-0.16
@@ -20,7 +20,7 @@ USE_LIBTOOL= YES
USE_X11BASE= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index c6ec753b622..96d23cdb733 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2001/04/30 04:16:08 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2001/06/11 06:34:28 jlam Exp $
DISTNAME= libgtop-1.0.12
CATEGORIES= devel gnome
@@ -49,6 +49,5 @@ CONFIGURE_ARGS+= --with-libgtop-guile --with-catgets
CONFIGURE_ENV+= AWK="${AWK}"
CONFIGURE_ENV+= LN_S="${LN} -s"
CONFIGURE_ENV+= PERL="${PERL5}"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libhfs/Makefile b/devel/libhfs/Makefile
index ad06ecebae3..bc592751423 100644
--- a/devel/libhfs/Makefile
+++ b/devel/libhfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 14:38:36 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:28 jlam Exp $
#
DISTNAME= hfsutils-3.2.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.mars.org/home/rob/proj/hfs/
COMMENT= library for accessing HFS (Apple Macintosh) volumes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I./
+CPPFLAGS= -I.
USE_LIBTOOL= yes
diff --git a/devel/libsmi/Makefile b/devel/libsmi/Makefile
index a1a6e320332..c4f52f42a3a 100644
--- a/devel/libsmi/Makefile
+++ b/devel/libsmi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:38:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:28 jlam Exp $
#
DISTNAME= libsmi-0.1.6
@@ -23,7 +23,6 @@ CONFIGURE_ARGS+=--with-smipath="${MIBDIR}:${PREFIX}/share/snmp/mibs:${PREFIX}/li
.include "../../mk/bsd.prefs.mk"
.if ${OS_VERSION:M1.4} || ${OS_VERSION:M1.3} || ${OS_VERSION:M1.2}
CPPFLAGS+= -Dstrtoll=strtoq -Dstrtoull=strtouq
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 0d6a03f02dc..5acca49872a 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/04/02 20:06:12 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/06/11 06:34:28 jlam Exp $
#
DISTNAME= maketool-0.6.1
@@ -18,6 +18,6 @@ USE_LIBINTL= yes
USE_X11= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile
index 407de104249..51379fac7fc 100644
--- a/devel/netcdf/Makefile
+++ b/devel/netcdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 14:38:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:29 jlam Exp $
#
DISTNAME= netcdf-3.4
@@ -15,6 +15,6 @@ COMMENT= Library for array-oriented data access
USE_FORTRAN= # defined
USE_LIBTOOL= # defined
GNU_CONFIGURE= # defined
-CONFIGURE_ENV+= CPPFLAGS="-Df2cFortran -Dunix"
+CPPFLAGS+= -Df2cFortran -Dunix
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 286bcc5d11e..a45a7f5fad0 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/04/06 21:55:39 rh Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:29 jlam Exp $
#
DISTNAME= oaf-0.6.5
@@ -17,6 +17,6 @@ USE_X11BASE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11PREFIX}/include -I${LOCALBASE}/include"
+CPPFLAGS+= -I${X11PREFIX}/include -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index abdd8c72f93..54a7b534ada 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:09 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:29 jlam Exp $
#
DISTNAME= rpc2-1.10
@@ -23,6 +23,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CONFIGURE_ENV+= ac_cv_search_tgetent="-ltermcap"
CONFIGURE_ENV+= PERL=${PERL5}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index a9780996ae8..07bd39b09eb 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/05/12 06:36:42 tron Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:29 jlam Exp $
# FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
DISTNAME= sdcc-2.2.1-src
@@ -33,7 +33,6 @@ CONFIGURE_ARGS+=--datadir=${LOCALBASE}/share/sdcc
# by default on some, not on others
CPPFLAGS+= -fdollars-in-identifiers
CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index a399101fbd8..d02e29a074c 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/08 01:04:40 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:30 jlam Exp $
DISTNAME= STLport-4.0
PKGNAME= stlport-4.0
@@ -19,7 +19,6 @@ NO_CONFIGURE= # defined
MAKE_ENV+= CC="--tag CC ${GCC_BINDIR}/cc"
MAKE_ENV+= CXX="--tag CXX ${GCC_BINDIR}/c++"
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
MAKEFILE= gcc-libtool.mak
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index 2c572f72a21..1f3fb9c4ff7 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/05/17 08:38:44 abs Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:30 jlam Exp $
#
DISTNAME= tvision-0.7
@@ -14,6 +14,6 @@ GNU_CONFIGURE= YES
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/devel/xdelta/Makefile b/devel/xdelta/Makefile
index a698bb541dc..fa7516a5984 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/02/16 14:39:06 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/06/11 06:34:30 jlam Exp $
#
DISTNAME= xdelta-0.22
@@ -15,7 +15,7 @@ DEPENDS+= gdbm>=1.7.3:../../databases/gdbm
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
-LDFLAGS+= "-L${LOCALBASE}/lib"
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
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
diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index 35c67c96188..f10a5b6ace9 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 14:43:55 agc Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:32 jlam Exp $
#
DISTNAME= gpsim-0.20.7
@@ -18,7 +18,6 @@ DEPENDS+= popt-*:../../devel/popt
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS+="${LDFLAGS}"
CONFIGURE_ARGS+= --with-exdbm=${PREFIX}
USE_GMAKE= YES
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index ea473f1ec09..bce281f0171 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/31 21:38:51 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:32 jlam Exp $
DISTNAME= uae-0.8.16
PKGNAME= ${DISTNAME}nb1
@@ -19,7 +19,6 @@ GNU_CONFIGURE= yes
# we use a brute force method to avoid detection of gtk+.
CONFIGURE_ARGS+= --enable-dga --enable-vidmode \
--with-gtk-prefix=${WRKDIR}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
do-install:
cd ${WRKSRC} && ${INSTALL_PROGRAM} readdisk uae ${PREFIX}/bin
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index f0e8ed31dc2..5b46ebf5f7f 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/05/26 01:35:54 mjl Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:32 jlam Exp $
#
DISTNAME= gnucash-1.4.12
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+= --without-motif --without-included-gettext
CONFIGURE_ARGS+= --with-perl-includes=${PERL5_ARCHLIB}
CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 28382297626..a7d76ab56f3 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/04/02 20:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/06/11 06:34:32 jlam Exp $
DISTNAME= baduki-0.2.9
CATEGORIES= games
@@ -21,6 +21,5 @@ CONFIGURE_ARGS+= --without-included-gettext
CONFIGURE_ENV+= GTK_CONFIG="${GTKDIR}/bin/gtk-config"
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index 37ee00937e1..ff59033a17d 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:33 jlam Exp $
DISTNAME= clanbomber-1.01
PKGNAME= ${DISTNAME}nb1
@@ -17,7 +17,6 @@ USE_GMAKE= yes
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${X11BASE}/include
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CFLAGS}"
# needs a valid X display to compile its datafiles
.ifndef DISPLAY
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index 8a628b6042b..6c7501c2d64 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2001/05/02 16:34:58 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2001/06/11 06:34:33 jlam Exp $
DISTNAME= freeciv-${FC_VERS}
FC_VERS= 1.11.4
@@ -16,7 +16,6 @@ DISTINFO_FILE= ${.CURDIR}/../../games/freeciv-share/distinfo
PATCHDIR= ${.CURDIR}/../../games/freeciv-share/patches
GNU_CONFIGURE= # defined
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
USE_LIBINTL= # defined
.include "../../mk/bsd.pkg.mk"
diff --git a/games/pacman/Makefile b/games/pacman/Makefile
index 65d5912b116..bfa0f0665a1 100644
--- a/games/pacman/Makefile
+++ b/games/pacman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/16 15:10:56 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:33 jlam Exp $
DISTNAME= Pacman-0.3-CVS-00-11-17
PKGNAME= Pacman-0.3
@@ -18,7 +18,6 @@ USE_GMAKE= yes
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${X11BASE}/include
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CFLAGS}"
# needs a valid X display to compile its datafiles
.ifndef DISPLAY
diff --git a/games/plib/Makefile b/games/plib/Makefile
index 541a3ded161..055678bfe65 100644
--- a/games/plib/Makefile
+++ b/games/plib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:56 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:33 jlam Exp $
#
DISTNAME= plib-1.2.0
@@ -12,7 +12,6 @@ COMMENT= libraries for writing portable games/realtime interactive apps
USE_X11= YES
USE_MESA= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -Dunix=1 -I${X11PREFIX}/include -I${X11BASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 4db480d4d9a..51f4aee7f16 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/03/09 20:27:10 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:34 jlam Exp $
DISTNAME= xboard-4.2.3
CATEGORIES= games
@@ -19,7 +19,6 @@ INFO_FILES= xboard.info
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --enable-xpm
CONFIGURE_ARGS+= --enable-zippy # interface to ICS
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${X11PREFIX}/include
.include "../../mk/bsd.prefs.mk"
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index b71dfddaf0d..658a2f52e5e 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/03/26 14:45:09 bad Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/11 06:34:34 jlam Exp $
#
DISTNAME= xgalaga-2.0.34
@@ -15,7 +15,7 @@ HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --prefix=${X11PREFIX}/share/xgalaga
CONFIGURE_ARGS+= --exec-prefix=${X11PREFIX}/bin
CFLAGS+= -I${X11PREFIX}/include
-CONFIGURE_ENV+= CPPFLAGS="${CFLAGS}"
+CPPFLAGS+= ${CFLAGS}
post-install:
${INSTALL_MAN} ${WRKSRC}/README ${X11PREFIX}/share/xgalaga/README
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 3fc24692a8b..68a4da786e8 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/04/02 20:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:34 jlam Exp $
#
DISTNAME= xracer-0.96.9
@@ -25,7 +25,6 @@ USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= # defined
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${X11BASE}/include
diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile
index bb5f339601f..a0ac0ef5736 100644
--- a/graphics/avifile/Makefile
+++ b/graphics/avifile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/14 23:09:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:34 jlam Exp $
DISTNAME= avifile-0.53.5
CATEGORIES= graphics
@@ -27,8 +27,8 @@ HAS_CONFIGURE= yes
CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" \
MOC="${MOC}" \
UIC="${UIC}" \
-# CPPFLAGS="-I${LOCALBASE}/include"
# LIBS="-Wl,-R${X11BASE}/qt2/lib -L${X11BASE}/qt2/lib"
+#CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --prefix=${PREFIX} --with-win32-path=${LOCALBASE}/lib/win32 \
--enable-sdl --without-qt
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 9ef2818075d..b41d6bc6946 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:59 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:34 jlam Exp $
DISTNAME= fly-1.6.5
CATEGORIES= graphics www
@@ -15,7 +15,6 @@ EVAL_PREFIX+= XPMDIR=xpm
USE_X11= yes # (perhaps) -lXpm
CPPFLAGS+= -I${XPMDIR}/include -I${XPMDIR}/include/X11 # Xpm.h
CPPFLAGS+= -I${LOCALBASE}/include # gd.h
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/fly ${PREFIX}/bin
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common
index 8b24db11ae1..5b81ccc8453 100644
--- a/graphics/freetype-lib/Makefile.common
+++ b/graphics/freetype-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2001/06/11 02:05:10 jlam Exp $
+# $NetBSD: Makefile.common,v 1.15 2001/06/11 06:34:35 jlam Exp $
DISTNAME= freetype-${FT_VERS}
FT_VERS= 1.3.1
@@ -25,7 +25,6 @@ PATCHDIR= ${.CURDIR}/../../graphics/freetype-lib/patches
.include "../../devel/gettext-lib/buildlink.mk"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LIBS="${LIBS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 7e8d95eee25..b75052280a9 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/05/22 09:32:20 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2001/06/11 06:34:35 jlam Exp $
# FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
#
@@ -37,7 +37,6 @@ GD_MINOR= 9
MAKE_ENV+= GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}"
EVAL_PREFIX+= XPMDIR=xpm
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include/freetype # freetype.h
CPPFLAGS+= -I${LOCALBASE}/include # png.h
CPPFLAGS+= -I${XPMDIR}/include -I${XPMDIR}/include/X11 # xpm.h
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index a63518299eb..7ee1a4b72fb 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2001/05/22 09:33:32 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2001/06/11 06:34:35 jlam Exp $
#
DISTNAME= gdk-pixbuf-0.10.1
@@ -21,7 +21,6 @@ USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= # defined
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
M4= ${LOCALBASE}/bin/gm4
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 6dc5a8de775..4f76702527d 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/02 15:08:52 jtb Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:35 jlam Exp $
DISTNAME= geomview-1.8.1
CATEGORIES= graphics math
@@ -21,7 +21,7 @@ EVAL_PREFIX+= MESABASE=Mesa
CONFIGURE_ARGS+= --without-xforms
CONFIGURE_ARGS+= --with-opengl=${MESABASE}
CONFIGURE_ARGS+= --with-motif=${MOTIFBASE}
-CONFIGURE_ENV+= CPPFLAGS="-Dunix -Dalloca=__builtin_alloca"
+CPPFLAGS+= -Dunix -Dalloca=__builtin_alloca
INFO_FILES= geomview
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile
index 58dc00a2366..08b670480ea 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/05/22 09:32:20 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/06/11 06:34:36 jlam Exp $
DISTNAME= gif2png-2.4.2
CATEGORIES= graphics converters
@@ -12,7 +12,6 @@ COMMENT= convert GIF files to PNG
DEPENDS+= png>=1.0.11:../../graphics/png
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index c97c33c8420..3baad004448 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2001/05/22 09:32:20 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2001/06/11 06:34:36 jlam Exp $
DISTNAME= gimp-1.2.1
CATEGORIES= graphics
@@ -35,8 +35,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" \
--disable-perl \
--disable-python
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- GNOME_CONFIG=no \
+CONFIGURE_ENV= GNOME_CONFIG=no \
INTLDEPS="-I${LOCALBASE}/include"
CPPFLAGS= -I${LOCALBASE}/include
diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index 21c9d64885a..f4e6e943930 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/02 20:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:36 jlam Exp $
#
DISTNAME= gnome-iconedit-1.2.0
@@ -20,7 +20,6 @@ USE_X11BASE= YES
# for finding libpng
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
post-configure:
cd ${WRKSRC}/src && ${GMAKE} clean
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index 5ff8030c10b..4decf6e0c71 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/28 01:35:25 briggs Exp $
+# $NetBSD: Makefile,v 1.12 2001/06/11 06:34:36 jlam Exp $
DISTNAME= gphoto-0.4.3
CATEGORIES= graphics
@@ -15,6 +15,5 @@ USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 94bada0900e..17a799a2669 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/04/02 20:06:14 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/06/11 06:34:36 jlam Exp $
#
DISTNAME= gqview-0.10.1
@@ -17,8 +17,6 @@ USE_LIBINTL= yes
USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=no
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
# for libpng recognition
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index cbe64337e7f..4c849c0e579 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2001/05/22 09:32:21 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2001/06/11 06:34:37 jlam Exp $
#
DISTNAME= imlib-1.9.8.1
@@ -22,7 +22,6 @@ USE_X11BASE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
PLIST_SUBST+= LOCALBASE=${LOCALBASE}
USE_GMAKE= yes
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index 6560ec24f17..c41750d7327 100644
--- a/graphics/libgdgeda/Makefile
+++ b/graphics/libgdgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/22 09:32:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:37 jlam Exp $
#
DISTNAME= libgdgeda-1.6
@@ -13,7 +13,7 @@ DEPENDS+= png>=1.0.11:../../graphics/png
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include"
+CPPFLAGS+= -I${PREFIX}/include
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index d32c0d9e1ff..5051e3e165c 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/14 17:47:27 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:37 jlam Exp $
#
DISTNAME= librsvg-1.0.0
@@ -18,6 +18,6 @@ USE_LIBTOOL= YES
USE_X11BASE= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/opendis/Makefile b/graphics/opendis/Makefile
index 8efc6c5b75f..463818c81de 100644
--- a/graphics/opendis/Makefile
+++ b/graphics/opendis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:22:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:37 jlam Exp $
DISTNAME= opendis-0.0.3
CATEGORIES= graphics
@@ -11,6 +11,5 @@ COMMENT= Download images from Flashpoint Digita-based cameras
#USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index bda17543c14..9e631132998 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/05/22 09:32:22 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/06/11 06:34:38 jlam Exp $
#
DISTNAME= plotutils-2.4.1
@@ -15,7 +15,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-libplotter
# make sure configure finds png
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
USE_LIBTOOL= yes
USE_X11BASE= yes
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 450d17469ec..52c7f767432 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/28 11:25:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:38 jlam Exp $
# FreeBSD Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp
#
@@ -24,7 +24,7 @@ USE_GMAKE= yes
#USE_X11BASE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include"
+CPPFLAGS+= -I${PREFIX}/include
# -O to work around a bug with -O2 and egcs.
CFLAGS= -O -I${LOCALBASE}/include
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index a3be6e5f559..7d253cab2bc 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/05/22 09:32:23 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2001/06/11 06:34:38 jlam Exp $
#
DISTNAME= xsane-0.72
@@ -31,8 +31,7 @@ USE_GMAKE= YES
USE_X11BASE= YES
LDFLAGS+= -L${PREFIX}/lib/sane -Wl,-R${PREFIX}/lib/sane
-INCLUDES= -I${PREFIX}/include -I${LOCALBASE}/include
-CPPFLAGS+= ${INCLUDES}
-CONFIGURE_ENV+= CPPFLAGS="${INCLUDES}" LIBS="-lintl"
+CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include
+CONFIGURE_ENV+= LIBS="-lintl"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/a60/Makefile b/lang/a60/Makefile
index de605d3ff20..f3d0c566351 100644
--- a/lang/a60/Makefile
+++ b/lang/a60/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/15 21:21:45 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:39 jlam Exp $
DISTNAME= a60-0.20a
CATEGORIES= lang
@@ -10,7 +10,6 @@ COMMENT= Algol 60 interpreter
GNU_CONFIGURE= yes
CPPFLAGS+= -Dunix
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
INFO_FILES= RRA60.info a60.info
diff --git a/lang/gb/Makefile b/lang/gb/Makefile
index eabb83b2260..22132e06595 100644
--- a/lang/gb/Makefile
+++ b/lang/gb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/07 21:33:24 rh Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:39 jlam Exp $
#
DISTNAME= gb-0.0.18
@@ -17,6 +17,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/lang/kaffe/Makefile b/lang/kaffe/Makefile
index c8fe282f41b..c263fedd4c1 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/05/22 09:32:24 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2001/06/11 06:34:39 jlam Exp $
#
DISTNAME= kaffe-1.0.6
@@ -23,7 +23,6 @@ ONLY_FOR_PLATFORM= *-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}/kaffe
CONFIGURE_ARGS+= --with-rtlibraries="${LOCALBASE}/lib ${X11BASE}/lib"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -Dunix -I${LOCALBASE}/include -I${X11BASE}/include
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index e17829fc2ca..be81bcf7ae1 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/06/11 02:05:12 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/06/11 06:34:39 jlam Exp $
#
DISTNAME= librep-${REP_VERS}
@@ -20,7 +20,6 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-readline
CONFIGURE_ARGS+= --with-gmp
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
PLIST_SUBST+= REP_VERS=${REP_VERS}
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 037aab9d58b..b8315b6e005 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/16 02:27:52 fredb Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:40 jlam Exp $
#
DISTNAME= Squeak-3.0pre2
@@ -22,7 +22,6 @@ USE_LIBTOOL= yes
USE_X11= yes
CPPFLAGS+= -DNETBSD_OSS_HACK
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
DIST_SUBDIR= squeak
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/Squeak-3.0/build
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile
index a9221b29856..7f2d52909c0 100644
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/05/22 01:21:16 jtb Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:40 jlam Exp $
DISTNAME= pl-lite-4.0.5
PKGNAME= swi-prolog-4.0.5
@@ -26,7 +26,6 @@ CPPFLAGS+= -D__unix__=1
READLINE_PREFIX_DEFAULT=${LOCALBASE}
EVAL_PREFIX+= READLINE_PREFIX=readline
CPPFLAGS+= -I${READLINE_PREFIX}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
PLIST_SUBST+= SWIPL=${SWIPL}
PLIST_SUBST+= SWILIBDIR=${DISTNAME:S,pl-lite,'${SWIPL}',}
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 3099ee2b551..60b606b155a 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/17 18:24:39 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:40 jlam Exp $
#
DISTNAME= balsa-1.0.0
@@ -20,6 +20,6 @@ USE_X11BASE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
CONFIGURE_ARGS+=--disable-more-warnings
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 775dec7c4b0..1968bdba539 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/06/04 20:49:31 jtb Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:40 jlam Exp $
DISTNAME= cyrus-imapd-1.6.24
PKGNAME= ${DISTNAME}nb1
@@ -54,7 +54,6 @@ CONFIGURE_ARGS+= --with-auth=unix
CONFIGURE_ARGS+= --without-krb
.endif
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LIBS="${LIBS}"
LIBS+= `sasl-config --libs`
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index d36b822769f..34c4d5dffcc 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/04 18:58:33 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:41 jlam Exp $
DISTNAME= mutt-1.3.18i
CATEGORIES= mail
@@ -14,7 +14,8 @@ BUILD_DEPENDS+= automake-1.4:../../devel/automake
DEPENDS+= libiconv>=1.5:../../converters/libiconv
USE_LIBINTL= YES
-MAKE_ENV+= CPPFLAGS=-I${LOCALBASE}/include LIBS=-lintl
+CPPFLAGS+= -I${LOCALBASE}/include
+MAKE_ENV+= LIBS=-lintl
CONFIGURE_ENV+= LIBS=-lintl
GNU_CONFIGURE= YES
USE_GMAKE= YES
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 33dae6daf03..9ae0541cc97 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2001/03/27 03:20:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.70 2001/06/11 06:34:41 jlam Exp $
DISTNAME= mutt-1.2.5i
CATEGORIES= mail
@@ -16,7 +16,8 @@ BUILD_DEPENDS+= automake-1.4:../../devel/automake
BUILD_USES_MSGFMT= yes
USE_LIBINTL= YES
-MAKE_ENV+= CPPFLAGS=-I${LOCALBASE}/include LIBS=-lintl
+CPPFLAGS+= -I${LOCALBASE}/include
+MAKE_ENV+= LIBS=-lintl
CONFIGURE_ENV+= LIBS=-lintl
GNU_CONFIGURE= YES
USE_GMAKE= YES
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index 336aed01a21..0c9ec54c555 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:25:09 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:41 jlam Exp $
#
DISTNAME= xbuffy-3.4
@@ -10,7 +10,6 @@ COMMENT= replacement for xbiff that handles multiple mail files
GNU_CONFIGURE= YES
USE_X11BASE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${X11BASE}/include
CPPFLAGS+= -Wall
diff --git a/math/R/Makefile b/math/R/Makefile
index d35f2ce4f97..092094fa97b 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/05/22 09:32:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/06/11 06:34:41 jlam Exp $
#
DISTNAME= R-1.1.1
@@ -44,7 +44,6 @@ CONFIGURE_ARGS+= --without-blas_risc
CONFIGURE_ARGS+= --without-dxml
CONFIGURE_ARGS+= --without-libmoto
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LIBS="${LIBS}"
CONFIGURE_ENV+= MAKE="${MAKE_PROGRAM}"
diff --git a/math/aribas/Makefile b/math/aribas/Makefile
index b0d5fb15644..47e6ef6358f 100644
--- a/math/aribas/Makefile
+++ b/math/aribas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/28 23:59:20 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:42 jlam Exp $
DISTNAME= aribas-1.20
CATEGORIES= math
@@ -10,7 +10,7 @@ COMMENT= Multi-precision floating point and big integer arithmetic calculator
WRKSRC= ${WRKDIR}/aribas/src
-MAKE_ENV+= CPPFLAGS="-DUNiX -DPROTO"
+CPPFLAGS+= -DUNiX -DPROTO
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/aribas ${PREFIX}/bin
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index 630925b3fab..0b779e9b08b 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:12 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:42 jlam Exp $
#
DISTNAME= calc-2.11.4t2
@@ -12,7 +12,4 @@ HOMEPAGE= http://www.isthe.com/chongo/tech/comp/calc/
COMMENT= C arbitrary precision calculator
.include "../../devel/readline/buildlink.mk"
-
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 1ab6787b1a5..0965c7c0b93 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:22:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:42 jlam Exp $
#
DISTNAME= geg-1.0.1
@@ -13,6 +13,4 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 3ae25918236..bf41454fb58 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/03/27 03:20:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:43 jlam Exp $
#
DISTNAME= gnumeric-0.64
@@ -24,7 +24,7 @@ USE_PERL5= YES
LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -Wl,-R${LOCALBASE}/lib
LDFLAGS+= -lunicode
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --without-bonobo
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/math/octave/Makefile b/math/octave/Makefile
index b09ef9f0124..b9dd94ace7e 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/05/19 03:56:37 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/06/11 06:34:43 jlam Exp $
# FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
DISTNAME= octave-2.0.16
@@ -24,7 +24,7 @@ USE_FORTRAN= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
CONFIGURE_ENV+= FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}"
-CONFIGURE_ENV+= CPPFLAGS=-I${WRKDIR}/include
+CPPFLAGS+= -I${WRKDIR}/include
LDFLAGS+= -Wl,-R${PREFIX}/lib -L${PREFIX}/lib
INFO_FILES= liboctave.info octave.info
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index aac5eaa5aca..c5004325109 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/03/27 03:20:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2001/06/11 06:34:43 jlam Exp $
#
DISTNAME= pspp-0.3.0
@@ -23,7 +23,6 @@ GNU_CONFIGURE= yes
USE_GTEXINFO= yes
USE_LIBINTL= yes
CPPFLAGS+= -Dunix=1
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
MAKE_ENV+= pkgsysconfdir="${PREFIX}/etc/pspp"
pre-configure:
diff --git a/math/udunits/Makefile b/math/udunits/Makefile
index c33ed69ed1e..73e30095282 100644
--- a/math/udunits/Makefile
+++ b/math/udunits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/04/28 23:59:22 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:43 jlam Exp $
DISTNAME= udunits
PKGNAME= udunits-1.11.7
@@ -14,7 +14,6 @@ WRKSRC= ${WRKDIR}/${PKGNAME}/src
DIST_SUBDIR= ${PKGNAME}
GNU_CONFIGURE= yes
CPPFLAGS+= -Df2cFortran -Dunix
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
USE_PERL5= yes
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/UDUNITS/.packlist
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index cce2213517d..67dcc969751 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2001/05/05 19:51:17 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2001/06/11 06:34:44 jlam Exp $
#
DISTNAME= vatsrc-4.0b2
@@ -17,7 +17,6 @@ DEPENDS+= gsm-1.0.10:../../audio/gsm
USE_X11= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ARGS+= --with-tcl=${PREFIX} --with-tk=${PREFIX}
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/gsm
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/
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 08fc2c93b14..3acd7003930 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2001/05/21 19:59:03 rh Exp $
+# $NetBSD: Makefile,v 1.54 2001/06/11 06:34:45 jlam Exp $
#
DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -23,9 +23,6 @@ LTCONFIG_OVERRIDE+= ${WRKSRC}/popt/ltconfig
LTCONFIG_OVERRIDE+= ${WRKSRC}/libIDL/ltconfig
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" # the build system runs
-# # configure again...
CPPFLAGS+= -I${LOCALBASE}/include # libintl.h
# for DISTNAME, PKGNAME, and PLIST
diff --git a/net/gnubile/Makefile b/net/gnubile/Makefile
index fa0f8525af1..751c72afa31 100644
--- a/net/gnubile/Makefile
+++ b/net/gnubile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/24 23:27:19 tron Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:45 jlam Exp $
DISTNAME= gnubile-0.20
CATEGORIES= net
@@ -13,6 +13,6 @@ DEPENDS+= gnome-core-*:../../x11/gnome-core
USE_GMAKE= YES
USE_X11= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="`xml-config --cflags`"
+CPPFLAGS+= `xml-config --cflags`
.include "../../mk/bsd.pkg.mk"
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 28c6b603ed6..249ec829b3a 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:10 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:45 jlam Exp $
#
DISTNAME= irrd2.0a-Aug22-2000
@@ -25,7 +25,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-gdbm
CONFIGURE_ARGS+=--disable-thread
CONFIGURE_ENV+= YACC=bison
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -g
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index f993caf4054..6e972a459c3 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2001/05/19 03:56:38 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2001/06/11 06:34:46 jlam Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
#
@@ -26,7 +26,6 @@ EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase
CONFIGURE_ARGS= "--datadir=${KDEBASEDIR}/share/kde" \
"--with-qt-dir=${QT1DIR}/qt1"
CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \
- CPPFLAGS="${CPPFLAGS}" \
CXXFLAGS="${CFLAGS}" \
all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 9e63013084d..2110b1fb81d 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/17 18:19:09 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/06/11 06:34:46 jlam Exp $
# $FreeBSD: ports/net/mtr/Makefile,v 1.16 1999/10/28 08:06:00 mharo Exp $
DISTNAME= mtr-0.42
@@ -17,7 +17,7 @@ USE_GMAKE= yes
USE_CURSES= yes
# next line only needed if ncurses are also installed
REPLACE_NCURSES= configure configure.in
-CONFIGURE_ENV+= CPPFLAGS=-I${PREFIX}/include
+CPPFLAGS+= -I${PREFIX}/include
do-install:
${INSTALL} -c -s -m 4755 -o root -g wheel ${WRKSRC}/mtr ${PREFIX}/sbin
diff --git a/net/nap/Makefile b/net/nap/Makefile
index 7dc31f55835..ab63d326eb5 100644
--- a/net/nap/Makefile
+++ b/net/nap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/26 20:53:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:46 jlam Exp $
DISTNAME= nap-1.4.4
CATEGORIES= net
@@ -11,7 +11,7 @@ COMMENT= Terminal based Napster client similar to ircII
DEPENDS+= ncurses>=5.0:../../devel/ncurses
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nap ${PREFIX}/share/examples/nap
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index 326d78dccdf..260f736dd1a 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/06/11 02:05:13 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2001/06/11 06:34:46 jlam Exp $
# FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp
#
@@ -13,7 +13,6 @@ COMMENT= FTP replacement with advanced user interface
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-extra-dirs
CONFIGURE_ARGS+= --disable-ncurses
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= ac_cv_lib_intl_strftime=no
.include "../../mk/bsd.prefs.mk"
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 143c64bcb64..00de659f971 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/02/17 18:19:18 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/06/11 06:34:46 jlam Exp $
DISTNAME= ntop-1.1
PKGNAME= ntop-1.1nb1
@@ -22,7 +22,6 @@ INSTALL_TARGET= install install-man
.if ${NEED_NCURSES} == "YES"
CPPFLAGS+= -I${LOCALBASE}/include # for ncurses.h
LDFLAGS+= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index f7c0eb85227..1daad50ec09 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2001/06/11 02:05:13 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2001/06/11 06:34:47 jlam Exp $
DISTNAME= samba-2.2.0
PKGNAME= ${DISTNAME}nb1
@@ -62,8 +62,6 @@ CONFIGURE_ARGS+= --with-pam
CONFIGURE_ARGS+= --without-smbwrapper
CONFIGURE_ARGS+= --without-smbmount
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-
INSTALL_FILE= ${WRKDIR}/INSTALL
DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index 3ad605e34d8..509d092cd9e 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 18:19:46 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:47 jlam Exp $
#
DISTNAME= tn5250-0.12.51
@@ -16,7 +16,6 @@ REPLACE_NCURSES= ${WRKSRC}/cursesterm.cc ${WRKSRC}/configure
.include "../../mk/bsd.prefs.mk"
.if ${NEED_NCURSES} == "YES"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
.endif
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index b665cc2005f..f6f020989d8 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:47 jlam Exp $
# $FreeBSD: ports/net/trafshow/Makefile,v 1.14 2000/06/28 12:53:15 alex Exp $
#
@@ -25,7 +25,7 @@ ALL_TARGET= trafshow
BUILD_DEFS+= USE_INET6
.if defined(USE_INET6) && ${USE_INET6} == "YES"
-CONFIGURE_ENV+= CPPFLAGS=-DINET6
+CPPFLAGS+= -DINET6
.endif
pre-configure:
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index e09de14a3cd..963e5f5a4f7 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2001/06/11 02:05:14 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2001/06/11 06:34:47 jlam Exp $
# Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
#
@@ -44,7 +44,6 @@ CONFIGURE_ARGS+= --disable-ripngd
PLIST_SRC+= ${PKGDIR}/PLIST
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LIBS="${LDFLAGS} ${LIBS}"
pre-configure:
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index e321e714691..c37f4c7874b 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/03/04 03:26:51 assar Exp $
+# $NetBSD: Makefile,v 1.22 2001/06/11 06:34:47 jlam Exp $
#
DISTNAME= zephyr-2.0.4
@@ -14,7 +14,7 @@ COMMENT= Zephyr Messaging Service
.if defined(KERBEROS)
USE_KERBEROS= yes
CONFIGURE_ARGS+="--with-krb4"
-CONFIGURE_ENV+= CPPFLAGS=-I/usr/include/kerberosIV
+CPPFLAGS+= -I/usr/include/kerberosIV
.else
CONFIGURE_ARGS+="--without-krb4"
.endif
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 95881e9104e..ca8a1f23370 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2001/04/06 22:12:07 rh Exp $
+# $NetBSD: Makefile,v 1.38 2001/06/11 06:34:48 jlam Exp $
#
DISTNAME= gnome-print-0.28
@@ -21,7 +21,6 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
CONFIGURE_ENV+= GHOSTSCRIPT=${LOCALBASE}/bin/gs
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
# override HOME to avoid trying to install ${HOME}/.gnome
MAKE_ENV+= HOME=${WRKSRC}
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 00b76b90f92..9c16afd71cb 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/11 02:05:14 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:48 jlam Exp $
DISTNAME= xpp-1.0
CATEGORIES= print x11
@@ -12,7 +12,6 @@ USE_X11= # defined
USE_GMAKE= # defined
GNU_CONFIGURE= # defined
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../print/cups/buildlink.mk"
.include "../../x11/fltk/buildlink.mk"
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 0e3af0f6753..2d457126c05 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:49:52 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:48 jlam Exp $
DISTNAME= mcrypt-2.5.5
CATEGORIES= security devel
@@ -15,6 +15,5 @@ USE_LIBTOOL= yes
USE_LIBINTL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 1e18871da53..8409a3154f0 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:50:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:48 jlam Exp $
#
DISTNAME= pam_ldap
@@ -17,7 +17,7 @@ DEPENDS+= openldap-*:../../databases/openldap
DEPENDS+= PAM-*:../../security/PAM
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${WRKSRC}"
+CPPFLAGS+= -I${WRKSRC}
CONFIGURE_ARGS+=--with-ldap-lib=openldap
CONFIGURE_ARGS+=--with-ldap-dir=${PREFIX}
INSTALL_TARGET= install install-data
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index a9f8c6a9850..90f597bb7cb 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/04/18 03:14:55 itojun Exp $
+# $NetBSD: Makefile,v 1.34 2001/06/11 06:34:49 jlam Exp $
#
DISTNAME= racoon-20010418a
@@ -23,8 +23,9 @@ BUILD_DEFS+= USE_INET6
# between 1.4 and 1.5, there were period where we had RSA-less
# /usr/lib/libcrypto. we do not support that configuration in the pkgsrc.
USE_SSL= yes
-CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include CFLAGS=-I${LOCALBASE}/include \
- LIBS="-L${LOCALBASE}/lib -L${WRKSRC}/../libipsec"
+CPPFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${WRKSRC}/../libipsec"
CONFLICTS+= racoon-*
diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile
index ffeb6300403..2034246038d 100644
--- a/security/srp_client/Makefile
+++ b/security/srp_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/06/06 21:43:56 jtb Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:49 jlam Exp $
#
DISTNAME= srp-1.4.4
@@ -25,7 +25,6 @@ CPPFLAGS+= -I${LOCALBASE}/include # gmp.h
LDFLAGS+= -L${LOCALBASE}/lib # libgmp.a
CONFIGURE_ARGS+= --with-srp --with-cast --enable-loginf
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.if exists(/usr/lib/libkrb.a)
CONFIGURE_ARGS+= --with-krb4
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
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 60a2e1b1389..1d5ed9cf5a6 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/05/08 16:12:07 agc Exp $
+# $NetBSD: Makefile,v 1.20 2001/06/11 06:34:52 jlam Exp $
#
DISTNAME= catdoc-0.91.4
@@ -17,6 +17,5 @@ USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --libdir=${PREFIX}/share
CPPFLAGS+= -Dunix -D__unix
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index c16407cbf00..81e4ad663dd 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/22 08:18:40 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:52 jlam Exp $
#
DISTNAME= icu-1.7
@@ -21,8 +21,6 @@ CONFIGURE_ARGS+= --disable-threads
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-
pre-configure:
${CHMOD} u+rx ${WRKSRC}/configure
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index da85dc4c7d6..bf4095f5503 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/06/11 02:05:15 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/06/11 06:34:52 jlam Exp $
#
DISTNAME= libxml-1.8.13
@@ -11,7 +11,6 @@ HOMEPAGE= http://xmlsoft.org/
COMMENT= XML parser, mainly used by the GNOME project
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index 1ee236b4f51..1abe905f95c 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:52 jlam Exp $
DISTNAME= urlview-0.9
CATEGORIES= textproc
@@ -16,7 +16,6 @@ DEPENDS+= ncurses>=5.0:../../devel/ncurses
#REPLACE_NCURSES= ${WRKSRC}/configure ${WRKSRC}/enter.h ${WRKSRC}/urlview.c
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS= -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/time/sunclock/Makefile b/time/sunclock/Makefile
index 8966edfdfbc..e1c91988502 100644
--- a/time/sunclock/Makefile
+++ b/time/sunclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:32:10 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:53 jlam Exp $
#
DISTNAME= sunclock-1.4
@@ -13,7 +13,7 @@ USE_IMAKE= yes
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
-MAKE_ENV+= CPPFLAGS=-DUSE_PUTENV
+CPPFLAGS+= -DUSE_PUTENV
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index b7aa480f7cd..2db45991081 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/05/19 03:56:40 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:53 jlam Exp $
DISTNAME= enlightenment-0.16.4
CATEGORIES= x11 gnome wm
@@ -20,7 +20,6 @@ USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-fsstd
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
MAKE_ENV+= USER=${SHAREOWN}:${SHAREGRP}
post-install:
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index fb28299f677..177eab49701 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:53 jlam Exp $
#
DISTNAME= flwm-0.25
@@ -15,7 +15,7 @@ DEPENDS+= fltk-*:../../x11/fltk
USE_X11BASE= # defined
GNU_CONFIGURE= # defined
-CONFIGURE_ENV+= X_LIBS="-lGL" CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+= X_LIBS="-lGL"
CPPFLAGS+= -I${X11PREFIX}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index a45c1907e2c..7fc8b6a76e5 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2001/03/03 22:01:11 tron Exp $
+# $NetBSD: Makefile.common,v 1.3 2001/06/11 06:34:53 jlam Exp $
#
DISTNAME= icewm-1.0.4
@@ -21,7 +21,6 @@ PATCHDIR= ${.CURDIR}/../../wm/icewm/patches
.if ${OPSYS} == "NetBSD"
.if exists(/usr/include/machine/apmvar.h)
CPPFLAGS+= -DCONFIG_APM
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.endif
.endif
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 927437b29b9..83df28ffd76 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:51 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:53 jlam Exp $
#
DISTNAME= wmakerconf-2.7
@@ -19,7 +19,6 @@ USE_PERL5= yes
USE_LIBINTL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
# for libProplist
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/wm/wmx-current/Makefile.common b/wm/wmx-current/Makefile.common
index 3e3c25e25a3..f3e358bd10c 100644
--- a/wm/wmx-current/Makefile.common
+++ b/wm/wmx-current/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2001/04/19 15:32:51 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2001/06/11 06:34:53 jlam Exp $
DISTNAME= wmx-6pre6
WMX_VERS= 5.0.6
@@ -15,8 +15,6 @@ USE_XPM= # defined
EVAL_PREFIX= XPMDIR=xpm
GNU_CONFIGURE= # defined
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
CPPFLAGS+= -I${XPMDIR}/include
CXXFLAGS+= -I${XPMDIR}/include
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index 5100f96a7fc..e4fd7aa40b7 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/06/06 00:28:04 jtb Exp $
+# $NetBSD: Makefile,v 1.28 2001/06/11 06:34:54 jlam Exp $
# FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
#
@@ -27,7 +27,6 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-zdir=/usr
CONFIGURE_ARGS+= --with-jpegdir=${LOCALBASE}
CONFIGURE_ARGS+= --with-pngdir=${LOCALBASE}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
EVAL_PREFIX= XPMDIR=xpm
diff --git a/www/arena/Makefile b/www/arena/Makefile
index 1d228ecca1b..759669fe189 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2001/05/22 09:32:26 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2001/06/11 06:34:54 jlam Exp $
# FreeBSD Id: Makefile,v 1.10 1998/05/04 20:22:31 jseger Exp
#
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --with-arenarc-dir=${LOCALBASE}/etc
CONFIGURE_ARGS+= --with-libwww-config-h-dir=${WRKDIR}
CONFIGURE_ARGS+= --with-libwww-include=${LOCALBASE}/include/w3c-libwww
CONFIGURE_ARGS+= --with-libwww-libdir=${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
# Arena requires libwww's "config.h" header - it is installed as "wwwconf.h",
# so make a symlink in ${WRKSRC}
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index a096c086525..74e5e748117 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/10 05:31:18 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:54 jlam Exp $
#
DISTNAME= bozohttpd-5.07
@@ -16,7 +16,6 @@ BUILD_DEFS+= USE_INET6
.if defined(USE_INET6) && (${USE_INET6} == "YES")
CPPFLAGS+= -DINET6
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
.endif
pre-patch:
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 87f4534a724..3144984fd7a 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/04/12 19:45:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:54 jlam Exp $
#
DISTNAME= gtkhtml-0.8.3
@@ -21,6 +21,6 @@ USE_X11BASE= YES
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/www/htdig/Makefile b/www/htdig/Makefile
index ebccec7926a..78b6384bf31 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:22 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:55 jlam Exp $
#
DISTNAME= htdig-3.1.5
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \
--with-image-dir=${PREFIX}/share/examples/htdig \
--with-search-dir=${PREFIX}/share/examples/htdig
-CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include/db2
+CPPFLAGS+= -I${PREFIX}/include/db2
post-install:
if [ ! -f ${PREFIX}/etc/htdig/htdig.conf ]; then \
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile
index 74ff5c5de5e..b3e75f71802 100644
--- a/www/htmldoc/Makefile
+++ b/www/htmldoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/05/22 09:32:27 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:55 jlam Exp $
#
DISTNAME= ${PKGNAME}-source
@@ -18,8 +18,8 @@ NOT_FOR_PLATFORM= NetBSD-1.[3-4]*-alpha #ps-pdf.cpp:3229: Internal compiler erro
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-x
-MAKE_ENV+= CPPFLAGS=-L${LOCALBASE}/lib \
- BINDIR=${PREFIX}/bin \
+CPPFLAGS+= -L${LOCALBASE}/lib
+MAKE_ENV+= BINDIR=${PREFIX}/bin \
MANDIR=${PREFIX}/man
do-install:
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 1a521f5cef6..ebce4707905 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/03/01 10:47:21 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:55 jlam Exp $
#
DISTNAME= gateway-0.8
@@ -16,8 +16,8 @@ DEPENDS+= pth>=1.3.5:../../devel/pth
USE_PERL5= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+=--disable-docs
.include "../../mk/bsd.pkg.mk"
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index dd31a05e143..61489763472 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2001/03/27 03:20:24 hubertf Exp $
+# $NetBSD: Makefile,v 1.32 2001/06/11 06:34:55 jlam Exp $
#
DISTNAME= lynx2.8.4dev.19
@@ -66,7 +66,6 @@ DEPENDS+= libslang-*:../../devel/libslang
DEPENDS+= ncurses-*:../../devel/ncurses
CONFIGURE_ARGS+= --enable-color-style
CPPFLAGS+= -I/usr/include -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.elif (${LYNX_SCREEN_LIB} == curses)
CONFIGURE_ENV+= cf_cv_ncurses_version=no
.else
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index d8220c450b8..46b23f25bc3 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2001/03/27 03:20:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.39 2001/06/11 06:34:55 jlam Exp $
#
DISTNAME= lynx2.8.3rel.1
@@ -159,8 +159,6 @@ DEPENDS+= socks5-1.0.2:../../net/socks5
.if defined(USE_INET6) && ${USE_INET6} == YES
CPPFLAGS+= -DINET6
.endif
-# current needs below
-#CONFIGURE_ENV+=CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/php3/Makefile b/www/php3/Makefile
index 85247ab8ba1..8aa4034d623 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/05/05 16:33:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.29 2001/06/11 06:34:56 jlam Exp $
#
DISTNAME= php-${PHP_VERSION}
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=--with-system-regex --without-gd \
CONFIGURE_ENV+= PERL_PATH=${PERL5}
.if !defined(BUILDING_EXTENSION_MODULE)
-CONFIGURE_ENV+= CPPFLAGS="-DPHP_INTERNAL_FUNCS"
+CPPFLAGS+= -DPHP_INTERNAL_FUNCS
post-extract:
@${CP} ${FILESDIR}/abstractions.c ${WRKSRC}
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index 88760146f6b..7e3b07fbc15 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2001/05/14 22:38:17 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2001/06/11 06:34:56 jlam Exp $
DISTNAME= php-${PHP_DIST_VERS}
PHP_DIST_VERS= 4.0.5
@@ -40,7 +40,6 @@ DEPENDS+= zlib-*:../../devel/zlib
# Here we configure only for what NetBSD ships. We add the rest via modules.
#
GNU_CONFIGURE= # defined
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LIBS="${LIBS}"
USE_LIBINTL= # defined
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 921ac009285..871e063815b 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:22:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:56 jlam Exp $
#
DISTNAME= wml-2.0.3
@@ -19,7 +19,6 @@ DEPENDS+= p5-Term-ReadKey>=2.11:../../devel/p5-Term-ReadKey
USE_PERL5= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-perl=${PERL5} \
--with-incdir=${LOCALBASE}/include \
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 3a02a0c8e22..f9a39002e1c 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/04/06 22:08:09 rh Exp $
+# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:56 jlam Exp $
DISTNAME= control-center-1.4.0.1
CATEGORIES= x11 gnome
@@ -26,7 +26,6 @@ LOCALSTATEDIR= /var/gnome
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR}
CONFIGURE_ARGS+= --with-glib-prefix=${LOCALBASE}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include # libintl.h
post-patch:
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 804ac1f5bff..8d659b9889f 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/06/11 02:05:16 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/06/11 06:34:56 jlam Exp $
#
DISTNAME= ${PKGNAME}-source
@@ -25,7 +25,6 @@ USE_LIBTOOL= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ARGS= --enable-libtool=${LIBTOOL}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../graphics/Mesa/buildlink.mk"
diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index a48bf7fc58a..74018ee62a9 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/27 07:57:38 sakamoto Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:57 jlam Exp $
# FreeBSD Id: ports/x11-toolkits/fox/Makefile,v 1.14 2001/02/23 19:00:05 knu Exp
DISTNAME= fox-0.99.172
@@ -24,7 +24,7 @@ PATCH_DIST_STRIP=-p1
CPPFLAGS+= -I..
X_CFLAGS= -DUSE_XUNICODE
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" X_CFLAGS="${X_CFLAGS}"
+CONFIGURE_ENV+= X_CFLAGS="${X_CFLAGS}"
.endif
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index a67a03a2c5f..57c19a36163 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/04/02 20:07:03 zuntum Exp $
+# $NetBSD: Makefile,v 1.21 2001/06/11 06:34:57 jlam Exp $
DISTNAME= gdm-2.2.0
CATEGORIES= x11 gnome
@@ -25,7 +25,7 @@ LOCALSTATEDIR= /var/gnome
EVAL_PREFIX+= KDEBASEDIR=kdebase
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LIBS="${LIBS}" \
+CONFIGURE_ENV+= LIBS="${LIBS}" \
LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
GDMOWN=${GDMOWN} GDMGRP=${GDMGRP}
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 1ec0f86ecc9..42616c78ea7 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/04/07 10:58:33 rh Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:57 jlam Exp $
#
DISTNAME= gnome-applets-1.4.0.1
@@ -19,7 +19,6 @@ USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
AUTOGEN_ENV= NOCONFIGURE=1
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index aff35560767..ba3fd7dab46 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2001/05/26 13:28:40 rh Exp $
+# $NetBSD: Makefile,v 1.66 2001/06/11 06:34:57 jlam Exp $
DISTNAME= gnome-core-1.4.0.4
CATEGORIES= x11 gnome
@@ -28,7 +28,6 @@ LOCALSTATEDIR= /var/gnome
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR}
CPPFLAGS+= -I${LOCALBASE}/include # libintl.h
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
USE_PERL5= YES
PERL_SCRIPTS= help-browser/gnome-convert help-browser/gnome-download
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 60b03a17726..59ecbf8006d 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2001/04/06 21:47:04 rh Exp $
+# $NetBSD: Makefile,v 1.61 2001/06/11 06:34:58 jlam Exp $
DISTNAME= gnome-libs-1.2.13
CATEGORIES= x11 gnome
@@ -25,8 +25,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--with-glib-prefix=${LOCALBASE} \
--with-kde-datadir=${X11PREFIX}/share/kde
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
- LOCALBASE=${LOCALBASE} \
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \
X11BASE=${X11BASE}
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index ab4e635298b..90151661559 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2001/04/30 04:16:12 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2001/06/11 06:34:58 jlam Exp $
DISTNAME= gtk+-1.2.10
CATEGORIES= x11
@@ -23,7 +23,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-xinput=xfree
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" X_LDFLAGS="${X_LDFLAGS}"
+CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}"
INFO_FILES= gdk.info gtk.info
diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile
index 0455f34541b..8ef24f2e4e1 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/10 13:19:27 agc Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:58 jlam Exp $
#
DISTNAME= wmfire-0.0.3.8
@@ -11,7 +11,7 @@ COMMENT= Displays generated fire according to system load
USE_X11= YES
USE_XPM= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS=-I${X11BASE}/include
+CPPFLAGS+= -I${X11BASE}/include
MAKE_ENV+= XPMDIR=${XPMDIR}
EVAL_PREFIX= XPMDIR=xpm
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index 9048a1c5a58..593307c2c6b 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:06:54 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:58 jlam Exp $
DISTNAME= wmfstatus-0.3
CATEGORIES= x11
@@ -12,7 +12,6 @@ USE_X11= YES
USE_XPM= YES
CPPFLAGS= -I${X11BASE}/include
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
WRKSRC= ${WRKDIR}/${DISTNAME}/wmfstatus
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index 08b7cb51576..0670cc4c72c 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/22 09:32:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:58 jlam Exp $
#
DISTNAME= wxGTK-2.2.3
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --with-zlib=sys
CONFIGURE_ARGS+= --with-libpng=sys
CONFIGURE_ARGS+= --with-libtiff=sys
CONFIGURE_ARGS+= --disable-threads
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 68e32ad3a72..ed6bcf9c2b7 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/04/02 20:06:15 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/06/11 06:34:59 jlam Exp $
DISTNAME= xfce-3.6.3
CATEGORIES= x11
@@ -29,8 +29,6 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc
CONFIGURE_ARGS+= --enable-imlib=${IMLIBDIR}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-
# work around bug in configure script
CONFIGURE_ENV+= gt_cv_func_gettext_libintl="yes"
diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index b430c849fd6..94de7c14780 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:07:18 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:59 jlam Exp $
#
DISTNAME= xmountains_2.5
@@ -17,7 +17,7 @@ NO_WRKSUBDIR= yes
USE_IMAKE= yes
DIST_SUBDIR= xmountains
-MAKE_ENV+= CPPFLAGS="-DVROOT"
+CPPFLAGS+= -DVROOT
# XXX Hack. We really want an OTHER_SITES/OTHERFILES mechanism for this.
do-patch:
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 0afe4c151eb..23cc83913bd 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:07:26 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:59 jlam Exp $
DISTNAME= xteddy-2.0.1
CATEGORIES= x11 games
@@ -15,7 +15,7 @@ CONFLICT+= xteddy-1.*
GNU_CONFIGURE= yes
USE_X11= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
+CPPFLAGS+= -I${X11BASE}/include
LDFLAGS+= -L${X11BASE}/lib -R${X11BASE}/lib # for libImlib
pre-configure: