LIBS is automatically added to CONFIGURE_ENV by bsd.pkg.mk if

GNU_CONFIGURE is defined, so simply set LIBS to the appropriate value.

6 files changed, 11 insertions, 13 deletions

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