Remove redundant uses of PTHREAD_{CFLAGS,LDFLAGS} now that they're added

automatically by pthread.buildlink3.mk.  Also, factor out the pthread
library out of PTHREAD_LDFLAGS into a standalone variable PTHREAD_LIBS
and use it in packages where necessary (usually the ones that don't
have a GNU configure script).

38 files changed, 66 insertions, 134 deletions

diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile
index 9cf3bf93406..038f82898c2 100644
--- a/audio/icecast1/Makefile
+++ b/audio/icecast1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/12 06:39:19 jlam Exp $
 #
 
 DISTNAME=	icecast-1.3.12
@@ -23,8 +23,6 @@ CONFIGURE_ARGS+=	--with-readline \
 			--sysconfdir=${PKG_SYSCONFDIR}
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.readline}/include/readline
 CPPFLAGS+=		${BUILDLINK_CPPFLAGS.${PYPACKAGE}}
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		${PTHREAD_LDFLAGS}
 LDFLAGS+=		${BUILDLINK_LDFLAGS.${PYPACKAGE}}
 LIBS+=			-lutil
 PTHREAD_OPTS+=		require
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index bf6ae39d29c..15202fb0858 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/11/12 00:04:52 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/11/12 06:39:20 jlam Exp $
 #
 
 DISTNAME=	gsmlib-1.10
@@ -20,8 +20,6 @@ USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-included-gettext
 PTHREAD_OPTS+=		require
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		${PTHREAD_LDFLAGS}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 18881f92a62..7a5840da3f0 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2004/10/05 12:12:57 minskim Exp $
+# $NetBSD: Makefile,v 1.75 2004/11/12 06:39:20 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
@@ -31,7 +31,6 @@ INFO_FILES=		glib.info
 TEST_TARGET=		check
 
 PTHREAD_OPTS+=		require
-CFLAGS.FreeBSD+=	${PTHREAD_CFLAGS}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/librfuncs/Makefile b/devel/librfuncs/Makefile
index 232d1f30488..80eda3b0f25 100644
--- a/devel/librfuncs/Makefile
+++ b/devel/librfuncs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/11/08 11:10:00 shannonjr Exp $
+# $NetBSD: Makefile,v 1.7 2004/11/12 06:39:20 jlam Exp $
 #
 
 DISTNAME=		librfuncs-1.0.5
@@ -18,12 +18,10 @@ USE_LIBTOOL=		yes
 TEST_TARGET=		check
 
 .include "../../mk/pthread.buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
 CONFIGURE_ARGS+=	--disable-threads
 .else
 CONFIGURE_ARGS+=	--enable-threads
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LDFLAGS}
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index ffa4a6cd26d..f9d1ad9f0d6 100644
--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:32 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/12 06:39:20 jlam Exp $
 #
 
 DISTNAME=		physfs-1.0.0
@@ -16,8 +16,6 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_GCC_SHLIB=		yes
 
-CONFIGURE_ARGS+=	LIBS="${PTHREAD_LDFLAGS}"
-
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index db73701b6d9..048a3829c75 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:33 tv Exp $
+# $NetBSD: Makefile,v 1.20 2004/11/12 06:39:20 jlam Exp $
 
 DISTNAME=	STLport-4.6
 PKGNAME=	stlport-4.6
@@ -22,6 +22,7 @@ MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 MAKEFILE=	gcc-libtool.mak
 
 PTHREAD_OPTS+=	require
+LDFLAGS+=	${PTHREAD_LIBS}
 
 INCDIR=		${PREFIX}/include/stlport
 LIBDIR=		${PREFIX}/lib
diff --git a/devel/stlport/distinfo b/devel/stlport/distinfo
index 1b1a2707e91..5219ad5cb3c 100644
--- a/devel/stlport/distinfo
+++ b/devel/stlport/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/01/05 22:14:18 mrauch Exp $
+$NetBSD: distinfo,v 1.7 2004/11/12 06:39:20 jlam Exp $
 
 SHA1 (STLport-4.6.tar.gz) = 55401b648bebc0b7b6b4e3d7b4e420d22c358af9
 Size (STLport-4.6.tar.gz) = 756708 bytes
-SHA1 (patch-aa) = 1fa541c702ac3edf67f9085343101fddd860409b
+SHA1 (patch-aa) = 9fb8af22933c925393bdcfb60988d100822501d7
 SHA1 (patch-aj) = 67dd73dcf5a41dd2da38e58363a05f7f54709124
 SHA1 (patch-ak) = ce55c80bc369bf9a8c20d751293197b71fbf4ed8
 SHA1 (patch-al) = d8331d464c810ea8cdeba5cb3fe1e34dea707761
diff --git a/devel/stlport/patches/patch-aa b/devel/stlport/patches/patch-aa
index dc14b342b9c..aade90c03de 100644
--- a/devel/stlport/patches/patch-aa
+++ b/devel/stlport/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2004/01/05 22:14:18 mrauch Exp $
+$NetBSD: patch-aa,v 1.5 2004/11/12 06:39:20 jlam Exp $
 
 --- src/gcc-libtool.mak.orig	2004-01-04 10:44:33.000000000 +0100
 +++ src/gcc-libtool.mak
@@ -23,9 +23,9 @@ $NetBSD: patch-aa,v 1.4 2004/01/05 22:14:18 mrauch Exp $
 +# guts for common stuff
 +#
 +#
-+LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o
++LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) -o
 +# 2.95 flag
-+DYN_LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) $(PTHREAD_LDFLAGS) -rpath $(PREFIX)/lib -version-info $(VERSION_MAJOR):$(VERSION_MINOR) -shared -o
++DYN_LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) -rpath $(PREFIX)/lib -version-info $(VERSION_MAJOR):$(VERSION_MINOR) -shared -o
 +
 +OBJEXT=lo
 +DYNEXT=la
@@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.4 2004/01/05 22:14:18 mrauch Exp $
 +
 +WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
 +
-+CXXFLAGS_COMMON = ${CXXFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) -I${STLPORT_DIR} ${WARNING_FLAGS}
++CXXFLAGS_COMMON = ${CXXFLAGS} ${CPPFLAGS} -I${STLPORT_DIR} ${WARNING_FLAGS}
 +
 +CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
 +CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 7d88aa88493..de43e9bdea9 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2004/11/10 12:58:48 adam Exp $
+# $NetBSD: Makefile,v 1.61 2004/11/12 06:39:20 jlam Exp $
 
 DISTNAME=	gd-2.0.33
 CATEGORIES=	graphics
@@ -14,7 +14,6 @@ USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 REPLACE_PERL=		bdftogd
-LIBS+=			${PTHREAD_LDFLAGS}
 
 BUILDLINK_DEPENDS.freetype2=	freetype2>=2.1.4
 
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index f2481199eb8..87e955d416b 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2004/10/15 14:50:06 tv Exp $
+# $NetBSD: Makefile,v 1.57 2004/11/12 06:39:20 jlam Exp $
 
 DISTNAME=		guile-1.6.4
 PKGREVISION=		4
@@ -23,10 +23,6 @@ INFO_FILES=		guile.info guile-tut.info goops.info r5rs.info
 TEST_DIRS=		${WRKSRC}
 TEST_TARGET=		check
 
-# Link the native thread so that Guile processes won't die when
-# libpthread.so is dl_open(3)'ed.
-CFLAGS+=		${PTHREAD_CFLAGS}                                                                                         
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index 7c5a7c41fa9..1bc50c30020 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/10/15 14:50:06 tv Exp $
+# $NetBSD: Makefile,v 1.21 2004/11/12 06:39:20 jlam Exp $
 
 DISTNAME=		guile-1.4.1
 PKGNAME=		guile14-1.4.1
@@ -22,10 +22,6 @@ INFO_FILES=		guile.info
 
 BUILDLINK_PASSTHRU_DIRS=	${LOCALBASE}/guile/1.4
 
-# Link the native thread so that Guile processes won't die when libpthread.so
-# is dl_open(3)'ed.
-CFLAGS+=		${PTHREAD_CFLAGS}
-
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 2f12435a468..88101ca00e4 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/10/03 00:13:00 tv Exp $
+# $NetBSD: Makefile,v 1.38 2004/11/12 06:39:20 jlam Exp $
 
 DISTNAME=	nxtvepg-2.6.0
 PKGREVISION=	2
@@ -26,7 +26,7 @@ CFLAGS+=	-DUSE_THREADS=1
 MAKE_ENV+=	WANT_THREADS=1
 .endif
 # Required for Tcl/Tk 8.4
-LDFLAGS+=	${PTHREAD_LDFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 pre-configure:
 	cd ${WRKSRC};							\
diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo
index 3168bf3a7db..45bc9affb8b 100644
--- a/misc/openoffice/distinfo
+++ b/misc/openoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2004/06/05 12:22:47 mrauch Exp $
+$NetBSD: distinfo,v 1.24 2004/11/12 06:39:20 jlam Exp $
 
 SHA1 (openoffice-1.1.1/OOo_1.1.1p1_source.tar.bz2) = be2c5e799a33b70916528a6454297054db76328e
 Size (openoffice-1.1.1/OOo_1.1.1p1_source.tar.bz2) = 192388698 bytes
@@ -41,7 +41,7 @@ SHA1 (patch-al) = 8da112628aa1760edf26504b24860a12e688bc56
 SHA1 (patch-am) = 546afda0b6b5f223b5edf3933f769ab1064a46a2
 SHA1 (patch-an) = e030f5ae1dd3ad2bcb5bab21684df2ed8eaf717e
 SHA1 (patch-ao) = 68d21a0daf48d47c7a1ab398bb98c48d7f002c4e
-SHA1 (patch-ap) = 827d054cdcc243118a3011ddbed5bcc5bac09c24
+SHA1 (patch-ap) = 8f885c569f09ba3d66481e8d3b60238a50fd38bb
 SHA1 (patch-aq) = 82285ade1af0a0c5e84d322d5a3a925c095103bb
 SHA1 (patch-ar) = f185c705cda716e1b52e5b6ca6d9c5d2a9b341bc
 SHA1 (patch-as) = 71d4d5a1517274ed9aff3e6c2bd89265772c93af
diff --git a/misc/openoffice/patches/patch-ap b/misc/openoffice/patches/patch-ap
index df0c47621d0..f1223db8a80 100644
--- a/misc/openoffice/patches/patch-ap
+++ b/misc/openoffice/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.3 2004/05/03 20:56:36 mrauch Exp $
+$NetBSD: patch-ap,v 1.4 2004/11/12 06:39:20 jlam Exp $
 
 --- ../stlport/STLport-4.5.patch.orig	2004-04-17 20:08:34.000000000 +0200
 +++ ../stlport/STLport-4.5.patch
@@ -19,8 +19,8 @@ $NetBSD: patch-ap,v 1.3 2004/05/03 20:56:36 mrauch Exp $
 +! #
 +! # compiler
 +! # 
-+! CC+= $(PTHREAD_CFLAGS) -D_REENTRANT 
-+! CXX+= $(PTHREAD_CFLAGS) -D_REENTRANT 
++! CC+= -D_REENTRANT 
++! CXX+= -D_REENTRANT 
 +! 
 +! #
 +! # Basename for libraries
@@ -32,7 +32,7 @@ $NetBSD: patch-ap,v 1.3 2004/05/03 20:56:36 mrauch Exp $
 +! #
 +! #
 +! LINK=ar cr
-+! DYN_LINK=$(CXX) $(PTHREAD_LIBS) $(LDFLAGS) -fexceptions -shared -o
++! DYN_LINK=$(CXX) $(LDFLAGS) $(PTHREAD_LIBS) -fexceptions -shared -o
 +! 
 +! OBJEXT=o
 +! DYNEXT=so
diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk
index f6585ab4991..0b4640a7145 100644
--- a/mk/pthread.buildlink3.mk
+++ b/mk/pthread.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.14 2004/11/12 05:20:01 jlam Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.15 2004/11/12 06:39:20 jlam Exp $
 #
 # The pthreads strategy for pkgsrc is to "bless" a particular pthread
 # package as the Official Pthread Replacement (OPR).  A package that uses
@@ -171,7 +171,6 @@ PKG_SKIP_REASON= "${PKGNAME} needs pthreads, but ${_PKG_PTHREAD_BUILDLINK3_MK} i
 PTHREAD_CFLAGS=		${BUILDLINK_CFLAGS.pthread}
 PTHREAD_CFLAGS+=	${BUILDLINK_CPPFLAGS.pthread}
 PTHREAD_LDFLAGS=	${BUILDLINK_LDFLAGS.pthread}
-PTHREAD_LDFLAGS+=	${PTHREAD_LIBS}	# XXX This should be removed!
 PTHREAD_LIBS=		${BUILDLINK_LIBS.pthread}
 CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 CONFIGURE_ENV+=		PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}"
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index c6504d26458..8f7bad3c205 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/11/12 06:39:20 jlam Exp $
 #
 
 DISTNAME=		libdv-0.102
@@ -15,7 +15,6 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-LIBS+=			${PTHREAD_LDFLAGS}
 LIBS+=			${LIBOSSAUDIO}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 936752e58b8..74f0f4ee8a8 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2004/10/03 00:17:48 tv Exp $
+# $NetBSD: Makefile,v 1.108 2004/11/12 06:39:20 jlam Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -30,8 +30,6 @@ CONFIGURE_ENV+=	LIB_WRAP="-lwrap"
 PKGCONFIG_OVERRIDE+=	ORBit.pc.in
 PKGCONFIG_OVERRIDE+=	libIDL/libIDL.pc.in
 
-CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
-
 # for DISTNAME, PKGNAME
 ORBIT_MAJOR=		5
 ORBIT_MINOR=		15
@@ -43,4 +41,8 @@ INFO_FILES=		libIDL.info
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
+.if ${PTHREAD_TYPE} != "native"
+CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index 830c21cfa8f..cde8aadae4a 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2003/12/16 11:22:31 sketch Exp $
+$NetBSD: distinfo,v 1.21 2004/11/12 06:39:20 jlam Exp $
 
 SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038
 Size (ORBit-0.5.15.tar.gz) = 1335272 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = c2b7cc5f83230035c214600bff59d4dfefd92422
 SHA1 (patch-ac) = 49bc73c9e6d9b369ca9f44630be75539252e3df7
 SHA1 (patch-ad) = d4f61e2fef4b862606473ced8f0b27ea3b7f22b3
 SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb
-SHA1 (patch-af) = db34a280931fd2274b05f47751aab34234cab4f4
+SHA1 (patch-af) = 53be67746a3488a899e887de416d940f884f80d7
 SHA1 (patch-ag) = 875e83a597ab39d57abcfd9259d8ec15707ea45c
 SHA1 (patch-ai) = 06e1cb2bc9f4f5460cdde71526417cdaa38ff310
 SHA1 (patch-ak) = d569014320dbea40ccdb9e369e07c984ee7bd9de
diff --git a/net/ORBit/patches/patch-af b/net/ORBit/patches/patch-af
index b5f3a3e390c..32bb9281550 100644
--- a/net/ORBit/patches/patch-af
+++ b/net/ORBit/patches/patch-af
@@ -1,16 +1,7 @@
-$NetBSD: patch-af,v 1.8 2003/07/11 23:38:46 grant Exp $
+$NetBSD: patch-af,v 1.9 2004/11/12 06:39:20 jlam Exp $
 
 --- src/IIOP/Makefile.in.orig	Mon Jan  7 18:23:54 2002
 +++ src/IIOP/Makefile.in	Thu Apr  4 12:30:24 2002
-@@ -128,7 +128,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ $(PTHREAD_LDFLAGS)
- @HAVE_HOSTS_ACCESS_TRUE@libIIOP_la_DEPENDENCIES =  $(addsuffix .lo, \
- @HAVE_HOSTS_ACCESS_TRUE@$(basename $(filter %.o, $(shell ar t \
- @HAVE_HOSTS_ACCESS_TRUE@$(LIBWRAP_PATH)))))
 @@ -399,8 +399,11 @@
  
  make_libwrap_files: $(LIBWRAP_PATH)
diff --git a/net/aget/Makefile b/net/aget/Makefile
index b2cd2e3d272..fe00963f986 100644
--- a/net/aget/Makefile
+++ b/net/aget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/18 04:27:49 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/12 06:39:20 jlam Exp $
 #
 
 DISTNAME=	aget-0.4
@@ -25,8 +25,7 @@ SUBST_SED.options=	-e 's,CFLAGS =,\#CFLAGS =,' \
 			-e 's,CC =,\#CC =,'
 
 PTHREAD_OPTS+=          require
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LDFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .if ${OPSYS} == "SunOS"
 CFLAGS+=	-DSOLARIS
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index 14ea3163cf0..c0c4de65225 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/10/22 14:10:44 ben Exp $
+# $NetBSD: Makefile,v 1.32 2004/11/12 06:39:20 jlam Exp $
 
 DISTNAME=		ettercap-0.6.b
 PKGREVISION=		2
@@ -20,7 +20,7 @@ USE_BUILDLINK3=		yes
 USE_NCURSES=		# putwin()
 PTHREAD_OPTS+=		require
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
-LIBS+=			-ldes ${PTHREAD_LDFLAGS}
+LIBS+=			-ldes
 
 BUILD_DIRS=		${WRKSRC} ${WRKSRC}/plugins
 INSTALL_DIRS=		${WRKSRC} ${WRKSRC}/plugins
diff --git a/net/gift-openft/Makefile b/net/gift-openft/Makefile
index ba8a33b0630..782587a3269 100644
--- a/net/gift-openft/Makefile
+++ b/net/gift-openft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/15 12:14:07 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/11/12 06:39:20 jlam Exp $
 #
 
 DISTNAME=	gift-openft-0.2.1.3
@@ -16,8 +16,6 @@ GNU_CONFIGURE=	yes
 
 SHLIBTOOL_OVERRIDE=	libtool
 
-LIBS+=${PTHREAD_LDFLAGS} 
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
 .include "../../net/gift/buildlink3.mk"
diff --git a/net/gift/Makefile b/net/gift/Makefile
index 5bd1cf3c7cf..172af80f40b 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/15 12:14:07 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/11/12 06:39:20 jlam Exp $
 #
 
 DISTNAME=	gift-0.11.6
@@ -16,8 +16,6 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-LIBS+=			${PTHREAD_LDFLAGS}
-
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/lib/libgift.pc.in
 
 .include "../../devel/libltdl/buildlink3.mk"
diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile
index 92a70dfaec6..26e1deb470f 100644
--- a/net/gkrellm-multiping/Makefile
+++ b/net/gkrellm-multiping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:17:52 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/11/12 06:39:20 jlam Exp $
 #
 
 DISTNAME=	gkrellm-multiping-2.0.8
@@ -16,8 +16,6 @@ USE_PKGINSTALL=	YES
 SPECIAL_PERMS+=	${PREFIX}/lib/gkrellm2/plugins/pinger ${SETUID_ROOT_PERMS}
 PTHREAD_OPTS=	require
 
-MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}"
-
 post-patch:
 	${SED} -e s,@@PREFIX@@,${PREFIX}, ${WRKSRC}/multiping.c > ${WRKSRC}/multiping.c.sed
 	${CP} ${WRKSRC}/multiping.c.sed ${WRKSRC}/multiping.c
diff --git a/net/gkrellm-multiping/distinfo b/net/gkrellm-multiping/distinfo
index 0bc29a26803..9cb1e60e109 100644
--- a/net/gkrellm-multiping/distinfo
+++ b/net/gkrellm-multiping/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/24 23:41:55 cube Exp $
+$NetBSD: distinfo,v 1.2 2004/11/12 06:39:20 jlam Exp $
 
 SHA1 (gkrellm-multiping-2.0.8.tgz) = 88de3cda0e55ba33ed5c0d0c2d0aaa2c56ebf69d
 Size (gkrellm-multiping-2.0.8.tgz) = 14377 bytes
-SHA1 (patch-aa) = a1628341a804afb21116d7c6f70847e4ed66dcec
+SHA1 (patch-aa) = a4da915eccae50d254deb8c67d1c398df6189662
 SHA1 (patch-ab) = 465567eb777db1d144d23e7fc457fb63db8ff23c
 SHA1 (patch-ac) = 4151e6d76665d33293038832c9cba4c4f56b3a56
diff --git a/net/gkrellm-multiping/patches/patch-aa b/net/gkrellm-multiping/patches/patch-aa
index 5c88db0199b..781a4458e04 100644
--- a/net/gkrellm-multiping/patches/patch-aa
+++ b/net/gkrellm-multiping/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:41:56 cube Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/12 06:39:20 jlam Exp $
 
 --- Makefile.orig	2004-01-16 08:48:09.000000000 +0100
 +++ Makefile
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:41:56 cube Exp $
  
  pinger: pinger.c
 -	$(CC) `pkg-config glib-2.0 --cflags` $(OPT) -lpthread `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c
-+	$(CC) $(PTHREAD_CFLAGS) $(CFLAGS) `pkg-config glib-2.0 --cflags` $(OPT) $(PTHREAD_DFLAGS) `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c
++	$(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` $(OPT) $(LDFLAGS) `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c
  
  multiping.o: multiping.c decal_multiping_status.xpm
 -	$(CC) -Wall -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) -DVERSION=\"$(VERSION)\" -c multiping.c
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:41:56 cube Exp $
  
  multiping.so: multiping.o
 -	$(CC) -shared -Wl -ggdb `pkg-config gtk+-2.0 --libs`-o multiping.so multiping.o
-+	$(CC) $(CFLAGS) -shared -Wl `pkg-config gtk+-2.0 --libs`-o multiping.so multiping.o
++	$(CC) $(LDFLAGS) -shared -Wl `pkg-config gtk+-2.0 --libs` -o multiping.so multiping.o
  
  clean:
  	rm -f *.o *.so core
diff --git a/net/kphone/distinfo b/net/kphone/distinfo
index cb0cdfcfe54..7acee996ea6 100644
--- a/net/kphone/distinfo
+++ b/net/kphone/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2004/07/21 21:49:02 scw Exp $
+$NetBSD: distinfo,v 1.2 2004/11/12 06:39:21 jlam Exp $
 
 SHA1 (kphone-4.0.3.tar.gz) = 957e8836c032fd0b5f29f7967569eb2ff101e538
 Size (kphone-4.0.3.tar.gz) = 220383 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = 6edbc28aeb485b8004b6258b04d50c0888c28a31
 SHA1 (patch-ac) = 71ee825881b0a9135bdc4259c96a622e0c9cb268
 SHA1 (patch-ad) = 1017e963c72ac24b1b86f4c810222a8ee0583f33
 SHA1 (patch-ae) = be6482e3543dc990aee370aaf1750b5f802d73ac
-SHA1 (patch-af) = 5907274ec9cd14b39b6a12c9b9705907d6a649b0
+SHA1 (patch-af) = d3889d76ed5f082f6a39552a98791c27217c5d58
 SHA1 (patch-ag) = 5b203fd99de99d447e6974487f67d4bfe79c9acb
 SHA1 (patch-ah) = f61ea22795a38eb0243ff2df40c681fdfc9ed85a
 SHA1 (patch-ai) = 4e405c8d0db5617fb814776507308864ee698818
diff --git a/net/kphone/patches/patch-af b/net/kphone/patches/patch-af
index 72d6e5a4d2c..ee088b4c886 100644
--- a/net/kphone/patches/patch-af
+++ b/net/kphone/patches/patch-af
@@ -1,13 +1,12 @@
-$NetBSD: patch-af,v 1.1 2004/07/21 21:49:02 scw Exp $
+$NetBSD: patch-af,v 1.2 2004/11/12 06:39:21 jlam Exp $
 
 --- configure.orig	2004-04-01 16:56:26.000000000 +0100
 +++ configure	2004-07-21 11:45:46.000000000 +0100
-@@ -1860,7 +1860,7 @@
+@@ -1860,7 +1860,6 @@
           CFLAGS="$CFLAGS -g -DDEBUG"
  echo "$ac_t""yes" 1>&6
  else
 -CFLAGS="$CFLAGS -O3"
-+CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
  echo "$ac_t""no" 1>&6
  fi
  
diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index feee0d08d0d..ea240634a48 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/25 08:31:20 snj Exp $
+# $NetBSD: Makefile,v 1.7 2004/11/12 06:39:21 jlam Exp $
 
 DISTNAME=	maradns-1.0.18
 PKGREVISION=	1
@@ -20,6 +20,9 @@ MAKE_ENV+=		LANGUAGE="en"
 EGDIR=		${PREFIX}/share/examples/maradns
 CONF_FILES=	${EGDIR}/example_mararc ${PKG_SYSCONFDIR}/mararc
 
+.include "../../mk/pthread.buildlink3.mk"
+LDFLAGS+=	${PTHREAD_LIBS}
+
 post-patch:
 	${SED} -e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR},			\
 	    ${WRKSRC}/parse/ParseMaraRc.c > ${WRKSRC}/parse/ParseMaraRc.sed
@@ -29,7 +32,4 @@ post-install:
 	${MV} ${PREFIX}/share/doc/maradns/examples \
 		${PREFIX}/share/examples/maradns
 
-.include "../../mk/pthread.buildlink3.mk"
-LDFLAGS+=	${PTHREAD_LDFLAGS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index a3678ca0330..b1c5244b2d2 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2004/10/13 07:28:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.66 2004/11/12 06:39:21 jlam Exp $
 #
 
 DISTNAME=		gtk+-2.4.13
@@ -32,7 +32,6 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV+=		ac_cv_header_X11_extensions_Xinerama_h=no
 CONFIGURE_ENV+=		ac_cv_lib_Xinerama_XineramaQueryExtension=no
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+=		PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}"
 TEST_TARGET=		check
 
 PKGCONFIG_OVERRIDE=	gdk-2.0.pc.in
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 155483dd6fe..f537f0b0f33 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.32 2004/10/13 07:28:36 jmmv Exp $
+$NetBSD: distinfo,v 1.33 2004/11/12 06:39:21 jlam Exp $
 
 SHA1 (gtk+-2.4.13.tar.bz2) = d57ad7165317e580cb7fda7719e767232e6697b6
 Size (gtk+-2.4.13.tar.bz2) = 9272024 bytes
-SHA1 (patch-aa) = 05be7ab51f2e9297f68e4b51a0086ff64ace970b
-SHA1 (patch-ab) = 00ffc4436c64bd45042232a0a376d8a69de35d40
 SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
deleted file mode 100644
index f6a4ddef174..00000000000
--- a/x11/gtk2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2004/04/01 18:15:41 jmmv Exp $
-
---- gdk-pixbuf/Makefile.in.orig	2004-03-09 16:08:28.000000000 +0100
-+++ gdk-pixbuf/Makefile.in
-@@ -751,7 +751,7 @@ gdk_pixbuf_csource_LDFLAGS =
- am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT)
- gdk_pixbuf_query_loaders_OBJECTS = \
- 	$(am_gdk_pixbuf_query_loaders_OBJECTS)
--gdk_pixbuf_query_loaders_LDFLAGS =
-+gdk_pixbuf_query_loaders_LDFLAGS = $(PTHREAD_LDFLAGS)
- test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c
- test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT)
- test_gdk_pixbuf_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
deleted file mode 100644
index 61a914a54fd..00000000000
--- a/x11/gtk2/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2004/04/01 18:15:41 jmmv Exp $
-
---- gtk/Makefile.in.orig	2004-03-09 16:08:31.000000000 +0100
-+++ gtk/Makefile.in
-@@ -1113,7 +1113,7 @@ PROGRAMS = $(bin_PROGRAMS)
- 
- am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT)
- gtk_query_immodules_2_0_OBJECTS = $(am_gtk_query_immodules_2_0_OBJECTS)
--gtk_query_immodules_2_0_LDFLAGS =
-+gtk_query_immodules_2_0_LDFLAGS = $(PTHREAD_LDFLAGS)
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 1b4baed5373..c31470969a6 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2004/10/30 13:28:40 grant Exp $
+# $NetBSD: Makefile.common,v 1.41 2004/11/12 06:39:21 jlam Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
 CATEGORIES=		x11
@@ -104,6 +104,7 @@ post-patch:
 		-e 's:@MKDIR@:${MKDIR}:g' \
 		-e 's:@LIBQT@:${LIBQT}:g' \
 		-e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \
+		-e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS}:g' \
 		-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
 		${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
 	for dir in ${WRKSRC}/mkspecs/*; do \
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf
index 31372cb532b..6e65b62d19b 100644
--- a/x11/qt3-libs/files/qmake.conf
+++ b/x11/qt3-libs/files/qmake.conf
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.16 2004/10/19 13:27:48 markd Exp $
-# $Id: qmake.conf,v 1.16 2004/10/19 13:27:48 markd Exp $
+# $NetBSD: qmake.conf,v 1.17 2004/11/12 06:39:21 jlam Exp $
+# $Id: qmake.conf,v 1.17 2004/11/12 06:39:21 jlam Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -75,7 +75,7 @@ QMAKE_LIBS_X11		= -lXext -lX11 -lm @SYS_LIBS@
 QMAKE_LIBS_X11SM	= -lICE -lSM
 QMAKE_LIBS_QT		= @LIBQT@
 QMAKE_LIBS_QT_THREAD	= @LIBQT@
-QMAKE_LIBS_THREAD	= @PTHREAD_LDFLAGS@
+QMAKE_LIBS_THREAD	= @PTHREAD_LDFLAGS@ @PTHREAD_LIBS@
 
 QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile
index ddd06dc062f..4cf73effe29 100644
--- a/x11/xfce4-mcs-manager/Makefile
+++ b/x11/xfce4-mcs-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:18:39 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/12 06:39:21 jlam Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -10,9 +10,6 @@ COMMENT=	XFce4 settings manager
 
 PKGCONFIG_OVERRIDE=	xfce-mcs-manager/xfce-mcs-manager.pc.in
 
-CFLAGS+=	${PTHREAD_CFLAGS}
-LIBS+=		${PTHREAD_LDFLAGS}
-
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/libxfce4mcs/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 921e07d7d3d..e4f893d5507 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/10/03 00:18:39 tv Exp $
+# $NetBSD: Makefile,v 1.12 2004/11/12 06:39:21 jlam Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -9,9 +9,6 @@ COMMENT=	XFce4 panel
 
 PKGCONFIG_OVERRIDE=	panel/xfce4-panel-1.0.pc.in
 
-CFLAGS+=	${PTHREAD_CFLAGS}
-LIBS+=		${PTHREAD_LDFLAGS}
-
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common
index ae5beffbc54..5fd6fcf1b49 100644
--- a/x11/xosd/Makefile.common
+++ b/x11/xosd/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2004/09/14 08:25:43 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/11/12 06:39:21 jlam Exp $
 
 DISTNAME=	xosd-2.2.12
 CATEGORIES=	x11
@@ -26,6 +26,6 @@ CONFIGURE_ENV+=		F77=${FALSE}
 SUBST_CLASSES=		fixme
 SUBST_STAGE.fixme=	post-patch
 SUBST_FILES.fixme=	configure
-SUBST_SED.fixme=	-e "s|-lpthread|${PTHREAD_LDFLAGS}|g"
+SUBST_SED.fixme=	-e "s|-lpthread|${PTHREAD_LIBS}|g"
 
 .include "../../mk/pthread.buildlink3.mk"