diff options
author | jlam <jlam> | 2001-06-11 06:34:17 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-06-11 06:34:17 +0000 |
commit | 01b416b8957e91c09a5635c805d763d5b74e4b31 (patch) | |
tree | 6b373d2a314b8d27a2d1f47c4cb173dc5c0d7a48 /net | |
parent | 26569759863a8ddd7fa067f67fc02d52b894a43b (diff) | |
download | pkgsrc-01b416b8957e91c09a5635c805d763d5b74e4b31.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 'net')
-rw-r--r-- | net/ORBit/Makefile | 5 | ||||
-rw-r--r-- | net/gnubile/Makefile | 4 | ||||
-rw-r--r-- | net/irrd/Makefile | 3 | ||||
-rw-r--r-- | net/kdenetwork/Makefile | 3 | ||||
-rw-r--r-- | net/mtr/Makefile | 4 | ||||
-rw-r--r-- | net/nap/Makefile | 4 | ||||
-rw-r--r-- | net/ncftp2/Makefile | 3 | ||||
-rw-r--r-- | net/ntop/Makefile | 3 | ||||
-rw-r--r-- | net/samba/Makefile | 4 | ||||
-rw-r--r-- | net/tn5250/Makefile | 3 | ||||
-rw-r--r-- | net/trafshow/Makefile | 4 | ||||
-rw-r--r-- | net/zebra/Makefile | 3 | ||||
-rw-r--r-- | net/zephyr/Makefile | 4 |
13 files changed, 18 insertions, 29 deletions
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 |