diff options
39 files changed, 74 insertions, 91 deletions
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile index da9a5e684bb..92385811065 100644 --- a/audio/id3ed/Makefile +++ b/audio/id3ed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/06/11 02:05:07 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/06/12 20:33:00 jlam Exp $ # DISTNAME= id3ed-1.10.2 @@ -16,7 +16,6 @@ USE_GNU_READLINE= # uses rl_startup_hook .include "../../devel/readline/buildlink.mk" -CONFIGURE_ENV+= LIBS="${LIBS}" LIBS+= ${LDFLAGS} post-extract: diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index a2260d06c6e..8eb5582e7ca 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/04/17 16:03:18 skrll Exp $ +# $NetBSD: Makefile,v 1.4 2001/06/12 20:33:00 jlam Exp $ DISTNAME= kdemultimedia-2.1 CATEGORIES= audio kde @@ -10,7 +10,7 @@ DEPENDS+= pth>=1.3.7:../../devel/pth .include "../../x11/kde2/Makefile.part2" -CONFIGURE_ENV+= LIBS="-Wl,--export-dynamic" +LIBS= -Wl,--export-dynamic post-patch: ${CP} ${WRKSRC}/kscd/config.h.std ${WRKSRC}/kscd/config.h diff --git a/audio/lame/Makefile b/audio/lame/Makefile index f29bbbfad3a..785b6ab43b5 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/03/24 20:22:50 zuntum Exp $ +# $NetBSD: Makefile,v 1.14 2001/06/12 20:33:01 jlam Exp $ # VERS= 3.87 @@ -45,7 +45,6 @@ CFLAGS+= -O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \ -finline-functions -DFLOAT=double # optimized libffm (free fast math library) LIBS+= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lffm -lm -CONFIGURE_ENV+= LIBS="${LIBS}" .endif .include "../../mk/bsd.pkg.mk" diff --git a/audio/splay/Makefile b/audio/splay/Makefile index 7c70d5d01be..0e806590cf7 100644 --- a/audio/splay/Makefile +++ b/audio/splay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:50 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/06/12 20:33:01 jlam Exp $ # FreeBSD Id: Makefile,v 1.4 1997/08/09 23:37:33 fenner Exp # @@ -21,6 +21,6 @@ NOT_FOR_PLATFORM= *-*-sparc *-*-m68k *-*-macppc *-*-sparc64 GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-xsplay --without-pthread -CONFIGURE_ENV= LIBS="${LIBS} -lossaudio" +LIBS+= -lossaudio .include "../../mk/bsd.pkg.mk" diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile index a028e12a30a..3aa50d505ca 100644 --- a/chat/ircII/Makefile +++ b/chat/ircII/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/05/19 03:56:32 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/12 20:33:01 jlam Exp $ # FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp # @@ -40,7 +40,7 @@ DEPENDS+= socks5-1.0.2:../../net/socks5 .endif .if (${OPSYS} == SunOS) -CONFIGURE_ENV+= LIBS=-lnsl +LIBS= -lnsl .endif pre-install: diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile index edd6c7a6b31..91979ad9ff1 100644 --- a/comms/plptools/Makefile +++ b/comms/plptools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/06/11 06:34:22 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/06/12 20:33:01 jlam Exp $ # DISTNAME= plptools-0.6 @@ -19,8 +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+= LIBS="${LIBS}" - LIBS+= -ltermcap .include "../../mk/bsd.pkg.mk" diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile index e7b181c3f99..8ac6f2ff0ef 100644 --- a/converters/psiconv/Makefile +++ b/converters/psiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:22 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/06/12 20:33:02 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+= LIBS="${LIBS} `${MAGICK_CONFIG} --libs`" -CPPFLAGS+= `${MAGICK_CONFIG} --cppflags` -DIMAGEMAGICK" +CPPFLAGS+= `${MAGICK_CONFIG} --cppflags` -DIMAGEMAGICK +LIBS+= `${MAGICK_CONFIG} --libs` post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/psiconv diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 8d6f5fab6ec..033b786a67a 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/06/11 06:34:24 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2001/06/12 20:33:02 jlam Exp $ # DISTNAME= openldap-1.2.12 @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --enable-wrappers .if ${OPSYS} == "SunOS" DEPENDS+= db-2.7.7:../../databases/db CPPFLAGS+= -I${LOCALBASE}/include/db2 -CONFIGURE_ENV+= LIBS="-ldb2 -lpthread -lrt" +LIBS= -ldb2 -lpthread -lrt .endif PLIST_SRC= ${WRKDIR}/.PLIST_SRC diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common index 4ff1c136145..9b2395f8000 100644 --- a/databases/postgresql/Makefile.common +++ b/databases/postgresql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2001/06/11 06:34:24 jlam Exp $ +# $NetBSD: Makefile.common,v 1.21 2001/06/12 20:33:02 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+= LIBS="${LIBS}" MAKE_ENV+= CUSTOM_COPT="${CFLAGS}" post-extract: diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 562828f982b..fb3bd0073bf 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2001/06/11 06:34:26 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2001/06/12 20:33:02 jlam Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LIBINTL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +LIBS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include INFO_FILES= gettext.info diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile index 906f828424c..6938b8e64f5 100644 --- a/games/freeciv-server/Makefile +++ b/games/freeciv-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/06/11 02:05:10 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/06/12 20:33:03 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} @@ -14,7 +14,6 @@ USE_GNU_READLINE= # uses callback interface of GNU readline .include "../../devel/readline/buildlink.mk" -CONFIGURE_ENV+= LIBS="${LIBS}" LIBS+= -ltermcap do-install: diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common index 5b81ccc8453..2ffc22b8000 100644 --- a/graphics/freetype-lib/Makefile.common +++ b/graphics/freetype-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2001/06/11 06:34:35 jlam Exp $ +# $NetBSD: Makefile.common,v 1.16 2001/06/12 20:33:03 jlam Exp $ DISTNAME= freetype-${FT_VERS} FT_VERS= 1.3.1 @@ -24,7 +24,4 @@ DISTINFO_FILE= ${.CURDIR}/../../graphics/freetype-lib/distinfo PATCHDIR= ${.CURDIR}/../../graphics/freetype-lib/patches .include "../../devel/gettext-lib/buildlink.mk" - -CONFIGURE_ENV+= LIBS="${LIBS}" - .include "../../mk/bsd.pkg.mk" diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile index b870cc5b9a1..34559698972 100644 --- a/graphics/kdegraphics2/Makefile +++ b/graphics/kdegraphics2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/14 16:10:41 skrll Exp $ +# $NetBSD: Makefile,v 1.2 2001/06/12 20:33:03 jlam Exp $ # DISTNAME= kdegraphics-2.1 @@ -15,6 +15,6 @@ LTCONFIG_OVERRIDE+= ${WRKSRC}/kdvi/kpathsea/ltconfig .include "../../x11/kde2/Makefile.part2" -CONFIGURE_ENV+= LIBS="-Wl,--export-dynamic" +LIBS= -Wl,--export-dynamic .include "../../mk/bsd.pkg.mk" diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile index 3190b166987..6652c6d937b 100644 --- a/graphics/magicpoint/Makefile +++ b/graphics/magicpoint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/05/24 10:36:00 itojun Exp $ +# $NetBSD: Makefile,v 1.24 2001/06/12 20:33:03 jlam Exp $ DISTNAME= magicpoint-1.08a CATEGORIES= x11 graphics @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_IMAKE= yes CONFIGURE_ARGS= --disable-vflib --enable-freetype-charset16 \ --enable-locale -CONFIGURE_ENV+= LIBS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lintl" # needed so -lttf works +LIBS= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lintl # needed so -lttf works # We need to perform the steps normally done by ``xmkmf -a'' since some # files need to be created before ``make depend''. diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 7d253cab2bc..8381f5a95f2 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2001/06/11 06:34:38 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2001/06/12 20:33:04 jlam Exp $ # DISTNAME= xsane-0.72 @@ -32,6 +32,6 @@ USE_X11BASE= YES LDFLAGS+= -L${PREFIX}/lib/sane -Wl,-R${PREFIX}/lib/sane CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include -CONFIGURE_ENV+= LIBS="-lintl" +LIBS= -lintl .include "../../mk/bsd.pkg.mk" diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile index f60b702abf0..72c924bf8fe 100644 --- a/lang/ucblogo/Makefile +++ b/lang/ucblogo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:36 agc Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/12 20:33:04 jlam Exp $ DISTNAME= ucblogo-4.6 CATEGORIES= lang @@ -10,7 +10,7 @@ COMMENT= Brian Harvey's logo language interpreter MAKEFILE= makefile GNU_CONFIGURE= yes # otherwise ./configure guesses -L incorrectly -CONFIGURE_ENV+= LIBS=-L${X11BASE}/lib +LIBS= -L${X11BASE}/lib USE_X11= yes .include "../../mk/bsd.pkg.mk" diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 1968bdba539..6d14308a30a 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:40 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/06/12 20:33:04 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+= LIBS="${LIBS}" LIBS+= `sasl-config --libs` DEINSTALL_FILE= ${WRKDIR}/DEINSTALL diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 34c4d5dffcc..0bbc62f0486 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:41 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/06/12 20:33:04 jlam Exp $ DISTNAME= mutt-1.3.18i CATEGORIES= mail @@ -15,8 +15,8 @@ DEPENDS+= libiconv>=1.5:../../converters/libiconv USE_LIBINTL= YES CPPFLAGS+= -I${LOCALBASE}/include -MAKE_ENV+= LIBS=-lintl -CONFIGURE_ENV+= LIBS=-lintl +LIBS= -lintl +MAKE_ENV+= LIBS="${LIBS}" GNU_CONFIGURE= YES USE_GMAKE= YES CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh \ diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 9ae0541cc97..e85f296ba93 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2001/06/11 06:34:41 jlam Exp $ +# $NetBSD: Makefile,v 1.71 2001/06/12 20:33:05 jlam Exp $ DISTNAME= mutt-1.2.5i CATEGORIES= mail @@ -17,8 +17,8 @@ BUILD_USES_MSGFMT= yes USE_LIBINTL= YES CPPFLAGS+= -I${LOCALBASE}/include -MAKE_ENV+= LIBS=-lintl -CONFIGURE_ENV+= LIBS=-lintl +LIBS= -lintl +MAKE_ENV+= LIBS="${LIBS}" GNU_CONFIGURE= YES USE_GMAKE= YES CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh \ diff --git a/math/R/Makefile b/math/R/Makefile index 092094fa97b..2130f20582b 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/06/11 06:34:41 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2001/06/12 20:33:05 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+= LIBS="${LIBS}" CONFIGURE_ENV+= MAKE="${MAKE_PROGRAM}" CPPFLAGS+= -I${LOCALBASE}/include # readline/readline.h diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile index 7da84b8dad6..9dfe4116502 100644 --- a/misc/kdeutils2/Makefile +++ b/misc/kdeutils2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/14 16:05:41 skrll Exp $ +# $NetBSD: Makefile,v 1.2 2001/06/12 20:33:05 jlam Exp $ # DISTNAME= kdeutils-2.1 @@ -10,6 +10,6 @@ DEPENDS+= kdebase-2.1:../../x11/kdebase2 .include "../../x11/kde2/Makefile.part2" -CONFIGURE_ENV+= LIBS="-Wl,--export-dynamic" +LIBS= -Wl,--export-dynamic .include "../../mk/bsd.pkg.mk" diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index ba7f554abfd..e5df531c93e 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/04/09 12:00:28 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/06/12 20:33:05 jlam Exp $ DISTNAME= koffice-2.0.1 PKGNAME= koffice-1.0.1 @@ -16,6 +16,6 @@ DEPENDS+= kdebase-2.1:../../x11/kdebase2 .include "../../x11/kde2/Makefile.part2" -CONFIGURE_ENV+= LIBS="-Wl,-export-dynamic" +LIBS= -Wl,-export-dynamic .include "../../mk/bsd.pkg.mk" diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index a1a5266b01e..cfd1ab4a249 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2001/05/27 11:31:45 itojun Exp $ +# $NetBSD: Makefile,v 1.47 2001/06/12 20:33:06 jlam Exp $ # ETHEREAL_VERSION= 0.8.18 @@ -24,7 +24,6 @@ GNU_CONFIGURE= YES EVAL_PREFIX+= GTKDIR=gtk+ CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" \ --with-ucdsnmp=${LOCALBASE} -CONFIGURE_ENV+= LIBS="${LIBS}" LIBS+= -lcrypto PLIST_SUBST+= ETHEREAL_VERSION=${ETHEREAL_VERSION} diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile index 6df063e3a72..07110e6398e 100644 --- a/net/ntp4/Makefile +++ b/net/ntp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/17 18:19:19 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/06/12 20:33:06 jlam Exp $ # DISTNAME= ntp-4.0.99k @@ -14,7 +14,7 @@ DEPENDS+= readline-4.*:../../devel/readline GNU_CONFIGURE= YES -CONFIGURE_ENV+= "LIBS=-ltermcap" # for ntpdc +LIBS= -ltermcap # for ntpdc DOCDIR= ${PREFIX}/share/doc EXAMPLESDIR= ${PREFIX}/share/examples diff --git a/net/socks5/Makefile b/net/socks5/Makefile index 39611e9efca..ab310d7ec11 100644 --- a/net/socks5/Makefile +++ b/net/socks5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/02/23 13:38:41 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2001/06/12 20:33:06 jlam Exp $ # FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp # @@ -29,12 +29,12 @@ NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR}/socks5-v1.0r2 GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS=-lcrypt CONFIGURE_ARGS= --with-libconffile=${PREFIX}/etc/libsocks5.conf \ --with-srvconffile=${PREFIX}/etc/socks5.conf \ --with-srvpidfile=/var/run/socks5.pid \ --with-srvidtfile=/var/run/socks5.ident \ ${EXTRA_CONFIGURE_ARGS} +LIBS= -lcrypt post-install: ${MV} ${PREFIX}/lib/libsocks5_sh.so ${PREFIX}/lib/libsocks5_sh.so.0.0 diff --git a/net/vtun/Makefile b/net/vtun/Makefile index 2ab9cf17dec..3d848ee24c4 100644 --- a/net/vtun/Makefile +++ b/net/vtun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/05/13 19:02:47 kim Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/12 20:33:07 jlam Exp $ DISTNAME= vtun-2.4 CATEGORIES= net @@ -17,7 +17,6 @@ CONFIGURE_ARGS+=--with-ssl-headers=${SSLBASE}/include/openssl \ --with-lzo-headers=${LOCALBASE}/include \ --with-lzo-lib=${LOCALBASE}/lib LIBS+= ${LDFLAGS} -CONFIGURE_ENV+= LIBS="${LIBS}" ALL_TARGET= vtund PLIST_SUBST+= PREFIX=${PREFIX} diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index e8d960333b2..bb4d190d5ed 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 18:19:58 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/12 20:33:07 jlam Exp $ # DISTNAME= xipdump-1.5.4 @@ -18,8 +18,8 @@ PLIST_SRC= ${WRKDIR}/PLIST USE_X11BASE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CFLAGS="`${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines`" \ - LIBS="`${LIBNET_CONFIG} --libs`" +CFLAGS+= `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` +LIBS= `${LIBNET_CONFIG} --libs` post-build: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 963e5f5a4f7..75254aeb47e 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2001/06/11 06:34:47 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2001/06/12 20:33:07 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,7 @@ CONFIGURE_ARGS+= --disable-ripngd PLIST_SRC+= ${PKGDIR}/PLIST -CONFIGURE_ENV+= LIBS="${LDFLAGS} ${LIBS}" +LIBS+= ${LDFLAGS} pre-configure: cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf diff --git a/security/racoon/Makefile b/security/racoon/Makefile index 90f597bb7cb..6bd5e2ee5c7 100644 --- a/security/racoon/Makefile +++ b/security/racoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2001/06/11 06:34:49 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2001/06/12 20:33:07 jlam Exp $ # DISTNAME= racoon-20010418a @@ -25,7 +25,7 @@ BUILD_DEFS+= USE_INET6 USE_SSL= yes CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${WRKSRC}/../libipsec" +LIBS= -L${LOCALBASE}/lib -L${WRKSRC}/../libipsec CONFLICTS+= racoon-* diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common index 4a9b0eda172..f2fac15138b 100644 --- a/sysutils/mc/Makefile.common +++ b/sysutils/mc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2001/06/11 06:34:50 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2001/06/12 20:33:07 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+= LIBS="${LIBS}" LIBS+= -lm -ltermcap # -lslang LIBS+= -lintl # check for gettext is broken diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index e71928e5a1f..dbc21a997eb 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2001/06/11 06:34:51 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2001/06/12 20:33:08 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+= LIBS="${LIBS} -lsocket -lnsl" CPPFLAGS+= -I${X11BASE}/include +LIBS+= -lsocket -lnsl USE_GMAKE= YES .endif diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile index 89408f92dff..444705546f6 100644 --- a/textproc/xerces-c/Makefile +++ b/textproc/xerces-c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:57 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/06/12 20:33:08 jlam Exp $ # DISTNAME= xerces-c-src1_3_0 @@ -27,19 +27,18 @@ FLAGS+= -O2 -I${ICUROOT}/include \ CFLAGS+= ${FLAGS} CXXFLAGS+= ${FLAGS} - +LIBS= -L${ICUROOT}/lib -Wl,-R${ICUROOT}/lib +LIBS+= -L${ICUROOT}/lib/icu/current -Wl,-R${ICUROOT}/lib/icu/current + CONFIGURE_ENV+= XERCESCROOT="${WRKDIR}/xerces-c-src1_3_0" \ ICUROOT=${ICUROOT} \ NETACCESSOR=Socket \ - TRANSCODER=ICU \ - LIBS="-L${ICUROOT}/lib -Wl,-R${ICUROOT}/lib -L${ICUROOT}/lib/icu/current -Wl,-R${ICUROOT}/lib/icu/current" + TRANSCODER=ICU MAKE_ENV+= XERCESCROOT="${WRKDIR}/xerces-c-src1_3_0" \ ICUROOT="${LOCALBASE}" \ NETACCESSOR=Socket \ TRANSCODER=ICU \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" post-extract: ${MKDIR} ${WRKSRC}/util/Platforms/NetBSD diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 8df5808d85e..d55952c4ae9 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/11 02:05:15 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/12 20:33:08 jlam Exp $ DISTNAME= cadaver-0.17.0 CATEGORIES= www @@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --enable-netrc .include "../../devel/libgetopt/buildlink.mk" .include "../../devel/readline/buildlink.mk" -CONFIGURE_ENV+= LIBS="${LIBS}" CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no CONFIGURE_ENV+= ac_cv_lib_ncurses_tputs=no diff --git a/www/lynx/Makefile b/www/lynx/Makefile index 46b23f25bc3..acf0bf4aed3 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2001/06/11 06:34:55 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2001/06/12 20:33:09 jlam Exp $ # DISTNAME= lynx2.8.3rel.1 @@ -118,7 +118,7 @@ post-install: LYNX_SCREEN_LIB?= slang .if (${LYNX_SCREEN_LIB} == slang) DEPENDS+= libslang-*:../../devel/libslang -CONFIGURE_ENV+= LIBS="-lm -ltermcap" +LIBS= -lm -ltermcap .elif (${LYNX_SCREEN_LIB} == ncurses) DEPENDS+= ncurses-*:../../devel/ncurses CONFIGURE_ARGS+= --enable-color-style diff --git a/www/php3-pdflib/Makefile b/www/php3-pdflib/Makefile index 03ffb7b7f5c..41382af28e5 100644 --- a/www/php3-pdflib/Makefile +++ b/www/php3-pdflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/05/03 17:00:22 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2001/06/12 20:33:09 jlam Exp $ # PKGNAME= php-pdflib-${PHP_VERSION} @@ -10,7 +10,7 @@ DEPENDS+= pdflib>=3.0:../../print/pdflib CONFIGURE_ARGS+=--with-pdflib=${LOCALBASE} \ --with-jpeg-dir=${LOCALBASE} \ --with-tiff-dir==${LOCALBASE} -CONFIGURE_ENV+= LIBS=-lpng +LIBS= -lpng BUILDING_EXTENSION_MODULE=yes do-build: diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index 7e3b07fbc15..ef9de2dc711 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2001/06/11 06:34:56 jlam Exp $ +# $NetBSD: Makefile.common,v 1.14 2001/06/12 20:33:09 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+= LIBS="${LIBS}" USE_LIBINTL= # defined .if exists(/usr/include/libintl.h) diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 57c19a36163..7e8d7a6919f 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/06/11 06:34:57 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2001/06/12 20:33:09 jlam Exp $ DISTNAME= gdm-2.2.0 CATEGORIES= x11 gnome @@ -25,8 +25,7 @@ LOCALSTATEDIR= /var/gnome EVAL_PREFIX+= KDEBASEDIR=kdebase CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} -CONFIGURE_ENV+= LIBS="${LIBS}" \ - LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ GDMOWN=${GDMOWN} GDMGRP=${GDMGRP} DEINSTALL_FILE= ${WRKDIR}/DEINSTALL diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 7a778480c9d..453fba640df 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/05/11 17:43:21 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.15 2001/06/12 20:33:10 jlam Exp $ DISTNAME= kdebase-2.1 CATEGORIES= x11 kde @@ -17,7 +17,7 @@ USE_MESA= yes .include "../../x11/kde2/Makefile.part2" CONFIGURE_ARGS+= --disable-greet-lib -CONFIGURE_ENV+= LIBS="-Wl,--export-dynamic" +LIBS= -Wl,--export-dynamic EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} IMAKEDIR= ${WRKDIR}/imake diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index cff95092096..4dda952d990 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/05/24 22:18:22 skrll Exp $ +# $NetBSD: Makefile,v 1.5 2001/06/12 20:33:10 jlam Exp $ # DISTNAME= kdelibs-2.1 @@ -11,6 +11,7 @@ DEPENDS+= tiff-*:../../graphics/tiff DEPENDS+= qt2-libs>=2.2.4:../../x11/qt2-libs DEPENDS+= libaudiofile-*:../../audio/libaudiofile DEPENDS+= jade>=1.2.1:../../textproc/jade + .include "../../x11/kde2/Makefile.part2" USE_LTDL= yes @@ -22,8 +23,8 @@ LTCONFIG_OVERRIDE+= ${WRKSRC}/ksgmltools/ltconfig DEPENDS+= pcre>=3.4:../../devel/pcre .endif -CONFIGURE_ENV+= LIBS="-Wl,--export-dynamic" \ - KJS_USE_PCRE="${KJS_USE_PCRE}" +CONFIGURE_ENV+= KJS_USE_PCRE="${KJS_USE_PCRE}" +LIBS= -Wl,--export-dynamic MKDIRS= share/kde/icons/locolor/32x32/actions/kde \ share/kde/icons/locolor/22x22/mimetypes \ |