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.

9 files changed, 41 insertions, 37 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"