Adjust to new pthread.buildlink.mk: remove USE_PTHREAD and replace with

appropriate PTHREAD_OPTS incantation, and move the checks for the value
of PTHREAD_TYPE below the inclusion of pthread.buildlink.mk.

38 files changed, 133 insertions, 130 deletions

diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index a07faeb92e8..84b19a37421 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/24 19:45:22 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/01 05:48:00 jlam Exp $
 
 DISTNAME=	arts-1.0.2
 CATEGORIES=	audio
@@ -13,19 +13,20 @@ USE_BUILDLINK_ONLY=	yes
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libltdl/libtool
 
 USE_PERL5=		build
-USE_PTHREAD=		native pth-syscall
-.include "../../mk/bsd.prefs.mk"
 
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
-CONFIGURE_ARGS+=	--disable-threading
-.endif
+.include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
 LIBS+=			-Wl,--export-dynamic
 .endif
 
 .include "../../audio/libaudiofile/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
 .include "../../x11/kde3/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
+CONFIGURE_ARGS+=	--disable-threading
+.endif
+
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
index 5edc4435a7e..e281179eac5 100644
--- a/audio/cheesetracker/Makefile
+++ b/audio/cheesetracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/07/18 09:31:50 agc Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/01 05:48:02 jlam Exp $
 #
 
 DISTNAME=		cheesetracker-0.5.5
@@ -15,13 +15,15 @@ DEPENDS+=		gtk-->=1.2:../../x11/gtk--
 GCC_VERSION!=           gcc --version
 .if (${GCC_VERSION:C/-.*$$//} == egcs)
 # "egcs" cannot be used, as this package tickles c++ compiler bugs
-.include "../../lang/gcc/Makefile.gcc"
+.  include "../../lang/gcc/Makefile.gcc"
 .endif
-GNU_CONFIGURE=		yes
-# XXX: This package assumes pthread is pth.
-#      (glib specifies `USE_PTHREAD=native pth.')
-CONFIGURE_ENV=		CXXFLAGS="-O -Dusleep=pth_usleep"
+
 USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV=		CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS+=		-O
+
+PTHREAD_OPTS+=		require
 
 post-extract:
 	${RM} -f ${WRKSRC}/install-sh
@@ -29,4 +31,5 @@ post-extract:
 	${CP} ${LOCALBASE}/share/automake/install-sh ${WRKSRC}/install-sh
 	${CP} ${LOCALBASE}/share/automake/mkinstalldirs ${WRKSRC}/mkinstalldirs
 
+.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cheesetracker/distinfo b/audio/cheesetracker/distinfo
index ae8f18e9ce0..913e13d5146 100644
--- a/audio/cheesetracker/distinfo
+++ b/audio/cheesetracker/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2002/06/23 13:51:42 kent Exp $
+$NetBSD: distinfo,v 1.6 2002/08/01 05:48:02 jlam Exp $
 
 SHA1 (cheesetracker-0.5.5.tar.gz) = a1f6c9310db97ab151670ec5af22e2a7dd42c099
 Size (cheesetracker-0.5.5.tar.gz) = 703797 bytes
 SHA1 (patch-aa) = e6c9db09b838f25b88a2e94f17145fea0357458c
-SHA1 (patch-ab) = 19a744e00bb7b3d18739a78747f519451ffaa934
+SHA1 (patch-ab) = 2189819631fe44cb1306db0ab45c3d8a8d3bc044
 SHA1 (patch-ac) = 0899a7117405f0f1ec4f3566db17a61948c3ddf4
 SHA1 (patch-ad) = 83c5724488ec351bae98cd78f09b95aff28aa1e5
 SHA1 (patch-ae) = b861d569c15e044092e6346cdea87448e7e0d42b
diff --git a/audio/cheesetracker/patches/patch-ab b/audio/cheesetracker/patches/patch-ab
index 66ea4efdb83..b59f81dd311 100644
--- a/audio/cheesetracker/patches/patch-ab
+++ b/audio/cheesetracker/patches/patch-ab
@@ -1,15 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2002/06/23 13:51:42 kent Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/01 05:48:03 jlam Exp $
 
---- program/cheesetracker.cpp.orig	Thu Apr 11 23:24:16 2002
+--- program/cheesetracker.cpp.orig	Fri Apr 12 02:24:16 2002
 +++ program/cheesetracker.cpp
-@@ -186,12 +186,19 @@
+@@ -186,12 +186,21 @@ void start_player() {
  
  }
  
++#ifdef _POSIX_THREAD_IS_GNU_PTH
 +gint pth_nbschedule(gint no_need_this) {
 +	pthread_yield_np();
 +	return 1;
 +}
++#endif
 +
  
  int main(int argc, char *argv[]) {
@@ -22,7 +24,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/23 13:51:42 kent Exp $
  
  	int tmperror,counter=0;
  	char * filename;
-@@ -238,9 +245,19 @@
+@@ -238,9 +247,19 @@ int main(int argc, char *argv[]) {
  	quit_player=false;
  
  	pthread_attr_init(&thread_attr);
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index 60faa123243..bb05c2f271e 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/13 15:38:41 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:03 jlam Exp $
 
 DISTNAME=	volume-0.8
 PKGNAME=	gkrellm-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	gkrellm volume mixer plugin
 
 DEPENDS+=       gkrellm-1.2.*:../../sysutils/gkrellm
 
-USE_PTHREAD=		native pth
+PTHREAD_OPTS=		require
 #USE_BUILDLINK_ONLY=	yes
 
 .include "../../graphics/imlib/buildlink.mk"
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index bb3676dc32d..60f5a47a9e8 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/06/15 21:04:26 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/01 05:48:04 jlam Exp $
 
 DISTNAME=	kdemultimedia-2.2.2
 PKGREVISION=	1
@@ -11,7 +11,7 @@ BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
 DEPENDS+=	xanim>=2.80.0:../../graphics/xanim
 
 USE_BUILDLINK_ONLY=	YES
-USE_PTHREAD=		native pth
+PTHREAD_OPTS+=		require
 
 CONFIGURE_ENV+=		ac_cv_path_kde_artsplug_compiles="${ARTSCCONFIG}"
 
@@ -21,8 +21,8 @@ CONFIGURE_ENV+=		ac_cv_path_kde_artsplug_compiles="${ARTSCCONFIG}"
 LIBS=			-Wl,--export-dynamic
 .endif
 
-.include "../../mk/pthread.buildlink.mk"
 .include "../../x11/kde2/buildlink.mk"
 .include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 629bbfa8925..c887d690a20 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/17 07:54:04 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:04 jlam Exp $
 
 DISTNAME=	kdemultimedia-3.0.2
 CATEGORIES=	audio
@@ -13,20 +13,20 @@ USE_BUILDLINK_ONLY=	YES
 #USE_CONFIG_WRAPPER=     yes                             # $GTK_CONFIG
 #CONFIGURE_ENV+=		ac_cv_path_kde_artsplug_compiles="${ARTSC_CONFIG}"
 
-USE_PTHREAD=            native pth-syscall
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
-CONFIGURE_ARGS+=        --disable-threading
-.endif
-
 .if ${OPSYS} == "NetBSD"
 LIBS=			-Wl,--export-dynamic
 .endif
 
-.include "../../mk/pthread.buildlink.mk"
 .include "../../audio/arts/buildlink.mk"
 .include "../../x11/kde3/buildlink.mk"
 .include "../../x11/kdebase3/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
+
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
+CONFIGURE_ARGS+=        --disable-threading
+.endif
+
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 5c0744b288e..5a3f202d6f7 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/03/18 14:13:50 rxg Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/01 05:48:05 jlam Exp $
 
 DISTNAME=	mp3blaster-3.1.1
 CATEGORIES=	audio
@@ -9,7 +9,7 @@ MAINTAINER=	rxg@netbsd.org
 HOMEPAGE=	http://www.stack.nl/~brama/mp3blaster.html
 COMMENT=	MP3 console curses-based player
 
-USE_PTHREAD=		native pth
+PTHREAD_OPTS=	require
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+="--with-cxxflags=${CXXFLAGS}" \
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 4575b07ee3b..fbebd61d48e 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/03/19 07:48:43 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/01 05:48:05 jlam Exp $
 
 DISTNAME=	vorbis-tools-1.0rc3
 PKGNAME=	vorbis-tools-1.0.0.7
@@ -27,9 +27,7 @@ CONFIGURE_ARGS+=	--with-ogg-prefix=${BUILDLINK_DIR}		\
 
 PLIST_SUBST+=	DISTNAME="${DISTNAME}"
 
-# vorbis-tools needs a working pthreads implementation, and pth is proven
-# to work.
-USE_PTHREAD=	native pth
+PTHREAD_OPTS+=	require
 
 .include "../../audio/libao/buildlink.mk"
 .include "../../audio/libogg/buildlink.mk"
diff --git a/chat/lmme/Makefile b/chat/lmme/Makefile
index 823e6a069cd..6e1f007abdc 100644
--- a/chat/lmme/Makefile
+++ b/chat/lmme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/15 20:59:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:06 jlam Exp $
 #
 
 DISTNAME=	lmme-0.6.4
@@ -11,9 +11,8 @@ COMMENT=	curses-based client for MSN Messenger chat system
 
 USE_BUILDLINK_ONLY=	YES
 USE_GMAKE=		YES
-USE_PTHREAD=		native pth
+PTHREAD_TYPE=		require
 GNU_CONFIGURE=		YES
-CXXFLAGS+=		-Dselect=pth_select -Dsleep=pth_sleep -Dread=pth_read -Dwrite=pth_write
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/lmme ${PREFIX}/bin/lmme
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 52ae7d74082..2e1a72aae51 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2002/06/15 21:19:59 cjep Exp $
+# $NetBSD: Makefile,v 1.44 2002/08/01 05:48:07 jlam Exp $
 
 DISTNAME=	openldap-2.0.23
 SVR4_PKGNAME=	oldap
@@ -28,23 +28,12 @@ CONFIGURE_ARGS+=	--enable-wrappers
 CONFIGURE_ARGS+=	--with-tls=openssl
 CONFIGURE_ARGS+=	--without-readline
 
-# Apparently, only _native_ pthreads are good enough, since compiling
-# OpenLDAP with a userland thread package like GNU pth results in a
-# slapd that isn't capable of passing the regression tests.
-#
-USE_PTHREAD=		native
-
 PKG_SYSCONFSUBDIR=	openldap
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=	--localstatedir=/var/openldap
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
-CONFIGURE_ARGS+=	--with-threads
-PLIST_SRC=		${.CURDIR}/PLIST.slurpd ${.CURDIR}/PLIST
-.endif
-
 .if ${OPSYS} == "SunOS"
 .include "../../databases/db/buildlink.mk"
 CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
@@ -116,8 +105,18 @@ post-install:
 		${RM} -f ${PKG_SYSCONFDIR}/$${file}.default;		\
 	done
 
+test:
+	-@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
+		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
+
 .include "../../security/openssl/buildlink.mk"
 .include "../../security/tcp_wrappers/buildlink.mk"
 .include "../../mk/pthread.buildlink.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
+CONFIGURE_ARGS+=	--with-threads
+PLIST_SRC=		${.CURDIR}/PLIST.slurpd ${.CURDIR}/PLIST
+.endif
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 80a6c41d101..043f3f59213 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2002/07/18 02:19:30 rh Exp $
+# $NetBSD: Makefile,v 1.47 2002/08/01 05:48:07 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
@@ -30,10 +30,7 @@ TEXINFO_OVERRIDE=	YES
 CFLAGS=		-O0
 .endif
 
-# GLib needs a working pthreads implementation, and pth is proven to work.
-USE_PTHREAD=	native pth
-
-.include "../../mk/bsd.prefs.mk"
+PTHREAD_OPTS+=		require
 
 GLIB_VERSION=		${DISTNAME:S/glib-//}
 GLIB_MAJOR_VERSION=	${GLIB_VERSION:C/\..*//}
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index 8bd6f54f0d5..a07322c99f5 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.16 2002/06/12 00:48:20 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.17 2002/08/01 05:48:08 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib.
 #
@@ -29,9 +29,8 @@ BUILDLINK_FILES.glib+=	lib/libglib.*
 BUILDLINK_FILES.glib+=	lib/libgmodule.*
 BUILDLINK_FILES.glib+=	lib/libgthread.*
 
-USE_PTHREAD=	native pth
+PTHREAD_OPTS+=	require
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../mk/pthread.buildlink.mk"
 
 BUILDLINK_TARGETS.glib=		glib-buildlink
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index df3f79e007d..9b912cdf2bb 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/06/30 16:26:45 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/01 05:48:08 jlam Exp $
 #
 
 DISTNAME=		glib-2.0.4
@@ -22,11 +22,10 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_PERL5=		yes
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-CPPFLAGS+=		-I${BUILDLINK_DIR}/PTL/include
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 # GLib needs a working pre-emptive pthreads implementation
-USE_PTHREAD=	native ptl2
+PTHREAD_OPTS+=		native
 
 test: build
 	cd ${WRKSRC} &&  ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
@@ -36,4 +35,10 @@ test: build
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/pkgconfig/buildlink.mk"
 .include "../../mk/pthread.buildlink.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
+CPPFLAGS+=		-I${BUILDLINK_DIR}/PTL/include
+.  include "../../devel/ptl2/buildlink.mk"
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib2/buildlink.mk b/devel/glib2/buildlink.mk
index 9515bb01d86..00daedfb02b 100644
--- a/devel/glib2/buildlink.mk
+++ b/devel/glib2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/05/10 01:17:28 rh Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/01 05:48:08 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib2.
 #
@@ -30,13 +30,18 @@ BUILDLINK_FILES.glib2+=	lib/libgmodule-2.0.*
 BUILDLINK_FILES.glib2+=	lib/libgobject-2.0.*
 BUILDLINK_FILES.glib2+=	lib/libgthread-2.0.*
 
+.include "../../converters/libiconv/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/pkgconfig/buildlink.mk"
 
-USE_PTHREAD=	native ptl2
+PTHREAD_OPTS+=	native
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../mk/pthread.buildlink.mk"
 
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
+.  include "../../devel/ptl2/buildlink.mk"
+.endif
+
 BUILDLINK_TARGETS.glib2=	glib2-buildlink
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.glib2}
 BUILDLINK_TARGETS+=		${BUILDLINK_PKG_CONFIG}
@@ -44,6 +49,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_PKG_CONFIG}
 pre-configure: ${BUILDLINK_TARGETS}
 glib2-buildlink: _BUILDLINK_USE
 
-.include "../../converters/libiconv/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
 .endif	# GLIB2_BUILDLINK_MK
diff --git a/devel/gnome-objc/Makefile b/devel/gnome-objc/Makefile
index e4089e9ff5f..aef84151a6a 100644
--- a/devel/gnome-objc/Makefile
+++ b/devel/gnome-objc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/03/13 17:36:49 fredb Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/01 05:48:09 jlam Exp $
 #
 
 DISTNAME=	gnome-objc-1.0.40
@@ -12,7 +12,7 @@ COMMENT=	Objective C API for gnome and gtk
 
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
-USE_PTHREAD=	native pth
+PTHREAD_OPTS+=	require
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
diff --git a/devel/libmpeg3/Makefile b/devel/libmpeg3/Makefile
index 199c71e9908..b1ef2610270 100644
--- a/devel/libmpeg3/Makefile
+++ b/devel/libmpeg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/07/22 09:23:10 agc Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/01 05:48:09 jlam Exp $
 #
 
 DISTNAME=	libmpeg3-1.3
@@ -20,7 +20,7 @@ USE_BUILDLINK_ONLY=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-USE_PTHREAD=	native pth
+PTHREAD_OPTS+=	require
 
 post-configure:
 	${ECHO} "CFLAGS+=-O2" >>${WRKSRC}/global_config
diff --git a/devel/libmpeg3/buildlink.mk b/devel/libmpeg3/buildlink.mk
index d5a88f78e50..5cde7816810 100644
--- a/devel/libmpeg3/buildlink.mk
+++ b/devel/libmpeg3/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/07/22 09:28:55 agc Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/01 05:48:10 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libmpeg3.
 #
@@ -42,9 +42,8 @@ BUILDLINK_FILES.libmpeg3+=	include/mpeg3/video/mpeg3video.h
 BUILDLINK_FILES.libmpeg3+=	include/mpeg3/video/slice.h
 BUILDLINK_FILES.libmpeg3+=	lib/libmpeg3.*
 
-USE_PTHREAD=	native pth
+PTHREAD_OPTS+=	require
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../mk/pthread.buildlink.mk"
 
 BUILDLINK_TARGETS.libmpeg3=	libmpeg3-buildlink
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index a5b7662099b..089bf91dce1 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/02/08 06:29:42 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/01 05:48:10 jlam Exp $
 #
 
 DISTNAME=		pwlib_min_1.1pl17
@@ -21,9 +21,7 @@ WRKSRC=			${WRKDIR}/pwlib
 USE_BUILDLINK_ONLY=	yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
-USE_PTHREAD=		native unproven-pthreads
-
-.include "../../mk/bsd.prefs.mk"
+PTHREAD_OPTS+=		native
 
 MAKE_ENV+=		PWLIBDIR=${WRKSRC}
 MAKE_ENV+=		CC="${CC}"
@@ -51,4 +49,9 @@ post-install:
 	done
 
 .include "../../mk/pthread.buildlink.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
+.  include "../../devel/unproven-pthreads/buildlink.mk"
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index 6cbcfd6985e..b69dc747600 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/15 21:10:51 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:11 jlam Exp $
 #
 
 DISTNAME=	BasiliskII_src_31052001
@@ -14,10 +14,10 @@ WRKSRC=		${WRKDIR}/BasiliskII-0.9/src/Unix
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_PTHREAD=	native pth
+PTHREAD_OPTS+=	require
 
-.include "../../mk/pthread.buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
 .include "../../audio/esound/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 991a353b11c..a180ba01615 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/07/14 07:44:43 kristerw Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/01 05:48:11 jlam Exp $
 
 DISTNAME=		s9xs139
 PKGNAME=		snes9x-1.39
@@ -15,8 +15,8 @@ COMMENT=		Super Nintendo Entertainment System (SNES) emulator
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 USE_GMAKE=		yes
-USE_PTHREAD=		native pth
 USE_X11=		yes
+PTHREAD_OPTS=		require
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index c737927c3a1..68713057119 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/07/25 07:05:15 martti Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/01 05:48:12 jlam Exp $
 
 DISTNAME=	kdegames-3.0.2
 CATEGORIES=	games
@@ -7,7 +7,7 @@ COMMENT=	Games for the KDE integrated X11 desktop
 .include "../../x11/kde3/Makefile.kde3"
 
 USE_BUILDLINK_ONLY=	YES
-USE_PTHREAD=		native pth-syscall
+PTHREAD_OPTS+=		require
 
 .include "../../x11/kde3/buildlink.mk"
 .include "../../x11/kdebase3/buildlink.mk"
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index b8cb791031d..ed1c857faa6 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2002/06/08 23:41:56 veego Exp $
+# $NetBSD: Makefile.common,v 1.4 2002/08/01 05:48:13 jlam Exp $
 
 MPLAYER_DIST_VERSION=	0.90pre5
 
@@ -32,7 +32,7 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 USE_GMAKE=		YES
 HAS_CONFIGURE=		YES
 
-USE_PTHREAD=		native pth
+PTHREAD_OPTS+=		require
 
 CONFIGURE_ARGS+=	--prefix="${PREFIX}"
 CONFIGURE_ARGS+=	--with-extraincdir="${BUILDLINK_DIR}/include"
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 505bd4aebfa..9b5bcd004e2 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/03/29 15:40:21 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.36 2002/08/01 05:48:14 jlam Exp $
 #
 
 DISTNAME=		tgif-4.1.42
@@ -12,8 +12,7 @@ COMMENT=		Fully-featured X11 drawing program
 USE_IMAKE=		yes
 USE_X11=		yes
 
-USE_PTHREAD=	native pth
-.include "../../mk/bsd.prefs.mk"
+PTHREAD_OPTS+=		require
 
 post-patch::
 	@${RM} -f ${WRKSRC}/Tgif.tmpl
diff --git a/inputmethod/Chinput/Makefile b/inputmethod/Chinput/Makefile
index c4f3dc1ef92..1d906e275ef 100644
--- a/inputmethod/Chinput/Makefile
+++ b/inputmethod/Chinput/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/15 09:31:38 shell Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/01 05:48:14 jlam Exp $
 
 DISTNAME=	Chinput-3.0
 CATEGORIES=	inputmethod
@@ -10,8 +10,8 @@ COMMENT=	Chinese input server
 
 DEPENDS+=	unicon-im>=1.2:../../inputmethod/unicon-im
 
-USE_PTHREAD=	native pth
 USE_X11BASE=	yes
+PTHREAD_OPTS+=	require
 
 ALL_TARGET=	chinput
 
diff --git a/inputmethod/unicon-im/Makefile b/inputmethod/unicon-im/Makefile
index aad87d8ec71..6a84ba375de 100644
--- a/inputmethod/unicon-im/Makefile
+++ b/inputmethod/unicon-im/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/15 09:29:14 shell Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/01 05:48:15 jlam Exp $
 
 DISTNAME=	unicon-1.2
 PKGNAME=	unicon-im-1.2
@@ -9,8 +9,8 @@ MAINTAINER=	rxg@netbsd.org
 HOMEPAGE=	http://www.opencjk.org/~yumj/project-chinput.html
 COMMENT=	libraries and modules of Unicon
 
-USE_PTHREAD=	native pth
 USE_LIBTOOL=	YES
+PTHREAD_OPTS+=	require
 
 GNU_CONFIGURE=	YES
 
diff --git a/lang/cilk/Makefile b/lang/cilk/Makefile
index 3a68d87ebc6..a84d1138976 100644
--- a/lang/cilk/Makefile
+++ b/lang/cilk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/07/17 08:36:10 agc Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/01 05:48:15 jlam Exp $
 
 DISTNAME=		cilk-5.3.1
 CATEGORIES=		lang parallel
@@ -13,8 +13,8 @@ GNU_CONFIGURE=		# defined
 USE_BUILDLINK_ONLY= 	# defined
 USE_GMAKE=		# defined
 USE_PERL5=		yes
-USE_PTHREAD=		native pth
 USE_LIBTOOL=		yes
+PTHREAD_OPTS+=		require
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 LTCONFIG_OVERRIDE= 	${WRKSRC}/ltconfig
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index ca9e3b38f05..c637adb69a2 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/07/02 12:56:07 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/01 05:48:16 jlam Exp $
 #
 
 DISTNAME=	balsa-1.2.4
@@ -29,14 +29,11 @@ CONFIGURE_ARGS+=	--disable-more-warnings --without-esmtp \
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 USE_BUILDLINK_ONLY=	yes
 
-# USE_PTHREAD=	native pth
-
 .include "../../converters/libiconv/buildlink.mk"
 .include "../../devel/libtool/buildlink.mk"
 .include "../../devel/libproplist/buildlink.mk"
 .include "../../devel/pcre/buildlink.mk"
 .include "../../textproc/libpspell/buildlink.mk"
 .include "../../x11/gnome-core/buildlink.mk"
-# .include "../../mk/pthread.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice3/Makefile b/misc/koffice3/Makefile
index 3831367f1f6..7aba5087b65 100644
--- a/misc/koffice3/Makefile
+++ b/misc/koffice3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/25 19:38:54 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:17 jlam Exp $
 
 DISTNAME=       koffice
 PKGNAME=        koffice3-${VERSION}          
@@ -10,7 +10,7 @@ DISTFILES=      ${DISTNAME}-${VERSION}-kde3.tar.bz2
 .include "../../x11/kde3/Makefile.kde3"
 
 MAINTAINER=     jschauma@netbsd.org
-USE_PTHREAD=	native pth-syscall
+PTHREAD_OPTS+=	require
 
 WRKSRC= ${WRKDIR}/${DISTNAME}-${VERSION}
 PATCHDIR=       ../../misc/koffice/patches
@@ -18,4 +18,5 @@ DESCR_SRC=      ../../misc/koffice/DESCR
   
 .include "../../x11/kde3/buildlink.mk"
 .include "../../x11/kdebase3/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../misc/koffice/Makefile.common"
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index 41bd9e7ac0d..98099bb39a3 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/07/31 21:14:04 mrauch Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/01 05:48:17 jlam Exp $
 
 DISTNAME=		openoffice-0.0.0.641
 PKGREVISION=		1
@@ -16,8 +16,7 @@ MAINTAINER=		mrauch@netbsd.org
 HOMEPAGE=		http://www.openoffice.org/
 COMMENT=		Integrated office productivity suite
 
-USE_PTHREAD=		native pth
-BUILDLINK_DEPENDS.pth=	pth>=1.4.0nb1
+PTHREAD_OPTS+=		require
 
 # OpenOffice requires gcc 2.95.2 or better,
 # so for NetBSD<=1.5 we need the package lang/gcc.
@@ -34,10 +33,6 @@ BUILD_DEPENDS+=		stlport>=4.0nb1:../../devel/stlport
 USE_JAVA=		build
 PKG_JVM=		sun-jdk
 
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
-
 CONFLICTS=		staroffice-[0-9]*
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5.3*-i386 NetBSD-1.5Z?-i386 \
@@ -96,4 +91,7 @@ do-install:
 	    <${FILESDIR}/soffice >${PREFIX}/bin/soffice
 	${CHMOD} +x ${PREFIX}/bin/soffice
 	
+.include "../../lang/perl5/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index 343b80457e2..f0cff4ba400 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/06/05 00:29:02 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/01 05:48:18 jlam Exp $
 
 DISTNAME=		ettercap-0.6.6.6
 CATEGORIES=		security net
@@ -14,7 +14,7 @@ CONFIGURE_ARGS+=	--enable-plugins \
 
 # missing newpad()
 USE_NCURSES=		yes
-USE_PTHREAD=		native pth
+PTHREAD_OPTS+=		require
 
 CPPFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
 
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 0292de57e7a..e5b5d3dbdc4 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/07/17 07:54:09 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/01 05:48:19 jlam Exp $
 
 DISTNAME=	kdenetwork-3.0.2
 CATEGORIES=	net
@@ -7,12 +7,12 @@ COMMENT=	Network modules for the KDE integrated X11 desktop
 .include "../../x11/kde3/Makefile.kde3"
 
 USE_BUILDLINK_ONLY=	yes
-USE_PTHREAD=		native pth-syscall
+PTHREAD_OPTS+=		require
 
 .include "../../converters/uulib/buildlink.mk"
 .include "../../databases/gdbm/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
 .include "../../x11/kde3/buildlink.mk"
 .include "../../x11/kdebase3/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ntop2/Makefile b/net/ntop2/Makefile
index 74206b7a54c..dc58c97b350 100644
--- a/net/ntop2/Makefile
+++ b/net/ntop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/07/23 11:36:01 agc Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/01 05:48:19 jlam Exp $
 
 DISTNAME=		ntop-2.1
 PKGNAME=		ntop2-2.1
@@ -21,7 +21,7 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_BUILDLINK_ONLY=	yes
 
-USE_PTHREAD=		native pth
+PTHREAD_OPTS+=		require
 
 .include "../../net/libpcap/buildlink.mk"
 .include "../../devel/ncurses/buildlink.mk"
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 31585cba99c..fff3bf1f610 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/10 10:13:56 agc Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:22 jlam Exp $
 
 DISTNAME=	scribus-0.7.5
 CATEGORIES=	print
@@ -8,7 +8,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://web2.altmuehlnet.de/fschmid/
 COMMENT=	Publishing layout with graphical interface
 
-USE_PTHREAD=    native pth-syscall
+USE_PTHREAD=    require
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index d2565f018c7..5fc1684102c 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/01 23:53:34 grant Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:23 jlam Exp $
 
 DISTNAME=	grun-0.9.2
 CATEGORIES=	misc
@@ -11,10 +11,11 @@ COMMENT=	GTK+ based Run dialog
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
-USE_PTHREAD=		native pth-syscall pth
+PTHREAD_OPTS+=		require
 
 post-install:
 	${MV} ${LOCALBASE}/man/man1/grun.1x ${LOCALBASE}/man/man1/grun.1
 
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 62951f7e63c..e3ffb9c2934 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/06/15 21:00:27 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/01 05:48:24 jlam Exp $
 #
 
 DISTNAME=	gateway-${KANNEL_VER}
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK_ONLY=	YES
 USE_GMAKE=		YES
 USE_PERL5=		YES
-USE_PTHREAD=		native pth
+PTHREAD_OPTS+=		require
 
 CONFIGURE_ARGS+=	--disable-docs
 
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 7d3f1fdf911..668ac6a0887 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/05/30 12:33:26 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/01 05:48:24 jlam Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
@@ -14,8 +14,7 @@ MAKE_ENV+=		LIBQT="${WRKSRC}/lib/libqt-mt.la"
 
 ALL_TARGET=		sub-plugins
 
-USE_PTHREAD=  native pth-syscall
-.include "../../mk/bsd.prefs.mk"
+PTHREAD_OPTS+=		require
 
 UNLIMIT_RESOURCES=	datasize
 
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index a567287413a..5d8ab562d32 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/05/30 12:33:28 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/01 05:48:25 jlam Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
@@ -14,7 +14,7 @@ MAKE_ENV+=              LIBQT="-lqt-mt"
 
 USE_BUILDLINK_ONLY=		yes
 
-USE_PTHREAD=	native pth-syscall
+PTHREAD_OPTS+=		require
 
 UNLIMIT_RESOURCES=	datasize
 
@@ -35,7 +35,7 @@ do-install:
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/qm2ts ${QTPREFIX}/bin
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/qtconfig ${QTPREFIX}/bin
 
-.include "../../mk/pthread.buildlink.mk"
 .include "../../x11/qt3-libs/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"