diff options
author | jlam <jlam@pkgsrc.org> | 2001-06-11 06:34:17 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-06-11 06:34:17 +0000 |
commit | c4e71c5e7a56600bcceba68cbed656ef7246e444 (patch) | |
tree | 6b373d2a314b8d27a2d1f47c4cb173dc5c0d7a48 /www | |
parent | a057ade2a392070aecc8ee511ae1cab01869b513 (diff) | |
download | pkgsrc-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.
Diffstat (limited to 'www')
-rw-r--r-- | www/Mosaic/Makefile | 3 | ||||
-rw-r--r-- | www/arena/Makefile | 4 | ||||
-rw-r--r-- | www/bozohttpd/Makefile | 3 | ||||
-rw-r--r-- | www/gtkhtml/Makefile | 4 | ||||
-rw-r--r-- | www/htdig/Makefile | 4 | ||||
-rw-r--r-- | www/htmldoc/Makefile | 6 | ||||
-rw-r--r-- | www/kannel/Makefile | 6 | ||||
-rw-r--r-- | www/lynx-current/Makefile | 3 | ||||
-rw-r--r-- | www/lynx/Makefile | 4 | ||||
-rw-r--r-- | www/php3/Makefile | 4 | ||||
-rw-r--r-- | www/php4/Makefile.common | 3 | ||||
-rw-r--r-- | www/wml/Makefile | 3 |
12 files changed, 20 insertions, 27 deletions
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 \ |