Set PTHREAD_AUTO_VARS to "yes" after pthread.buildlink3.mk was changed

not to automatically add pthread-related CFLAGS, LDFLAGS, and LIBS to
the configure and build processes.

8 files changed, 20 insertions, 12 deletions

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 74f0f4ee8a8..2ace4984515 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2004/11/12 06:39:20 jlam Exp $
+# $NetBSD: Makefile,v 1.109 2004/12/04 23:09:06 jlam Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -22,6 +22,7 @@ DEPENDS+=		gindent-[0-9]*:../../devel/gindent
 
 USE_GNU_TOOLS+=		lex make yacc
 USE_LIBTOOL=		YES
+PTHREAD_AUTO_VARS=	YES
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=	LIBWRAP_PATH=${BUILDLINK_PREFIX.tcp_wrappers}/lib/libwrap.a
diff --git a/net/aget/Makefile b/net/aget/Makefile
index 40a4fb4f49e..af140a794ab 100644
--- a/net/aget/Makefile
+++ b/net/aget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/04 11:51:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/04 23:09:06 jlam Exp $
 #
 
 DISTNAME=	aget-0.4
@@ -24,8 +24,8 @@ SUBST_SED.options=	-e 's,CFLAGS =,\#CFLAGS =,' \
 			-e 's,LDFLAGS =,\#LDFLAGS =,' \
 			-e 's,CC =,\#CC =,'
 
-PTHREAD_OPTS+=	require
-LDFLAGS+=	${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+PTHREAD_OPTS+=		require
+PTHREAD_AUTO_VARS=	yes
 
 .if ${OPSYS} == "SunOS"
 CFLAGS+=	-DSOLARIS
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index c0c4de65225..95a01f689a2 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/11/12 06:39:20 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2004/12/04 23:09:06 jlam Exp $
 
 DISTNAME=		ettercap-0.6.b
 PKGREVISION=		2
@@ -19,6 +19,7 @@ USE_BUILDLINK3=		yes
 
 USE_NCURSES=		# putwin()
 PTHREAD_OPTS+=		require
+PTHREAD_AUTO_VARS=	yes
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 LIBS+=			-ldes
 
diff --git a/net/gift-openft/Makefile b/net/gift-openft/Makefile
index 782587a3269..7ee092592f1 100644
--- a/net/gift-openft/Makefile
+++ b/net/gift-openft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/11/12 06:39:20 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/04 23:09:07 jlam Exp $
 #
 
 DISTNAME=	gift-openft-0.2.1.3
@@ -14,6 +14,7 @@ USE_BUILDLINK3=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
+PTHREAD_AUTO_VARS=	yes
 SHLIBTOOL_OVERRIDE=	libtool
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/net/gift/Makefile b/net/gift/Makefile
index 172af80f40b..8d8b8342dc3 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/11/12 06:39:20 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/04 23:09:06 jlam Exp $
 #
 
 DISTNAME=	gift-0.11.6
@@ -15,6 +15,7 @@ USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
+PTHREAD_AUTO_VARS=	yes
 
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/lib/libgift.pc.in
 
diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile
index 26e1deb470f..614cbba52f2 100644
--- a/net/gkrellm-multiping/Makefile
+++ b/net/gkrellm-multiping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/11/12 06:39:20 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/04 23:09:07 jlam Exp $
 #
 
 DISTNAME=	gkrellm-multiping-2.0.8
@@ -14,7 +14,9 @@ COMMENT=	Pings several machines and prints out stats
 USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 SPECIAL_PERMS+=	${PREFIX}/lib/gkrellm2/plugins/pinger ${SETUID_ROOT_PERMS}
-PTHREAD_OPTS=	require
+
+PTHREAD_OPTS=		require
+PTHREAD_AUTO_VARS=	yes
 
 post-patch:
 	${SED} -e s,@@PREFIX@@,${PREFIX}, ${WRKSRC}/multiping.c > ${WRKSRC}/multiping.c.sed
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index 2e5d8b15ae8..0639a2b2ecd 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/11/13 18:33:44 tron Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/04 23:09:07 jlam Exp $
 
 DISTNAME=		kphone-4.0.5
 CATEGORIES=		net comms
@@ -18,6 +18,7 @@ USE_GNU_TOOLS+=		make
 CONFIGURE_ENV=		QTDIR="${QTDIR}"
 
 PTHREAD_OPTS+=		require
+PTHREAD_AUTO_VARS=	yes
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/kphone/kphone ${PREFIX}/bin
diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index 630cd198fab..041f3f59ad2 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/12/04 11:58:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/04 23:09:07 jlam Exp $
 
 DISTNAME=	maradns-1.0.18
 PKGREVISION=	1
@@ -15,13 +15,14 @@ USE_PKGINSTALL=		yes
 RCD_SCRIPTS=		maradns
 HAS_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
+PTHREAD_AUTO_VARS=	yes
 MAKE_ENV+=		LANGUAGE="en"
 
 EGDIR=		${PREFIX}/share/examples/maradns
 CONF_FILES=	${EGDIR}/example_mararc ${PKG_SYSCONFDIR}/mararc
 
 .include "../../mk/pthread.buildlink3.mk"
-LDFLAGS+=	${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 post-patch:
 	${SED} -e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR},			\