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).
jsonn · Nov 12, 2004 · 8794608 · 8794608
1 parent d6f9d16
commit 8794608
Show file tree

Hide file tree

Showing 38 changed files with 66 additions and 134 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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