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).

13 files changed, 28 insertions, 43 deletions

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"