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.

18 files changed, 42 insertions, 24 deletions

diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index 6a69af5cf6e..105381677e1 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/11/27 20:45:04 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2004/12/04 23:09:06 jlam Exp $
 #
 
 DISTNAME=		icecast-2.1.0
@@ -14,6 +14,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
+PTHREAD_AUTO_VARS=	yes
 
 BUILD_DEFS+=		ICECAST_CHROOTDIR
 
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index 15202fb0858..0bee40ba86f 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/11/12 06:39:20 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/12/04 23:09:06 jlam Exp $
 #
 
 DISTNAME=	gsmlib-1.10
@@ -20,6 +20,7 @@ USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-included-gettext
 PTHREAD_OPTS+=		require
+PTHREAD_AUTO_VARS=	yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index cf84c678815..806e13efd72 100644
--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/11/28 14:35:19 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/12/04 23:09:06 jlam Exp $
 #
 
 DISTNAME=		physfs-1.0.0
@@ -15,6 +15,7 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 CONFIGURE_ARGS+=	--enable-pthreads
+PTHREAD_AUTO_VARS=	yes
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 048a3829c75..0873d771434 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/11/12 06:39:20 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2004/12/04 23:09:06 jlam Exp $
 
 DISTNAME=	STLport-4.6
 PKGNAME=	stlport-4.6
@@ -21,8 +21,9 @@ BUILD_DIRS=	${WRKSRC}/src
 MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 MAKEFILE=	gcc-libtool.mak
 
-PTHREAD_OPTS+=	require
-LDFLAGS+=	${PTHREAD_LIBS}
+PTHREAD_OPTS+=		require
+PTHREAD_AUTO_VARS=	yes
+LDFLAGS+=		${PTHREAD_LIBS}
 
 INCDIR=		${PREFIX}/include/stlport
 LIBDIR=		${PREFIX}/lib
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 864fb4aacff..0b58c537580 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/11/27 14:21:13 magick Exp $
+# $NetBSD: Makefile,v 1.41 2004/12/04 23:09:06 jlam Exp $
 
 DISTNAME=	nxtvepg-2.7.2
 CATEGORIES=	misc
@@ -17,6 +17,7 @@ USE_GNU_TOOLS+=	make
 USE_X11=	yes
 USE_BUILDLINK3= yes
 
+PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
 
 # Only native threads work.
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index 5cdd440d00f..9593800573b 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2004/11/13 22:04:53 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2004/12/04 23:09:06 jlam Exp $
 
 DISTNAME=		openoffice-1.1.1
 PKGREVISION=		2
@@ -32,6 +32,7 @@ USE_X11=		# defined
 USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 PTHREAD_OPTS+=		require
+PTHREAD_AUTO_VARS=	yes
 
 CONFLICTS+=		staroffice-[0-9]*
 CONFLICTS+=		openoffice-linux-[0-9]*
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index 4ccf0d60812..55b98e06b55 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/11/28 14:34:28 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/04 23:09:06 jlam Exp $
 
 DISTNAME=	libdv-0.103
 PKGREVISION=	1
@@ -14,6 +14,7 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libdv.pc.in
+PTHREAD_AUTO_VARS=	yes
 
 LIBS+=			${LIBOSSAUDIO}
 
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},			\
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 288802ab689..396b656cf46 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2004/12/04 22:19:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.68 2004/12/04 23:09:07 jlam Exp $
 #
 
 DISTNAME=		gtk+-2.4.14
@@ -23,6 +23,7 @@ USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
+PTHREAD_AUTO_VARS=	yes
 
 GNU_CONFIGURE=		 yes
 CONFIGURE_ARGS+=	--with-xinput=xfree
diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile
index 4cf73effe29..0cffff0fbc4 100644
--- a/x11/xfce4-mcs-manager/Makefile
+++ b/x11/xfce4-mcs-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/11/12 06:39:21 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/04 23:09:07 jlam Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -9,6 +9,7 @@ CATEGORIES=	x11
 COMMENT=	XFce4 settings manager
 
 PKGCONFIG_OVERRIDE=	xfce-mcs-manager/xfce-mcs-manager.pc.in
+PTHREAD_AUTO_VARS=	yes
 
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/libxfce4mcs/buildlink3.mk"
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index e4f893d5507..7718eadba1b 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/11/12 06:39:21 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/04 23:09:07 jlam Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -8,6 +8,7 @@ CATEGORIES=	x11
 COMMENT=	XFce4 panel
 
 PKGCONFIG_OVERRIDE=	panel/xfce4-panel-1.0.pc.in
+PTHREAD_AUTO_VARS=	yes
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"