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.

8 files changed, 33 insertions, 27 deletions

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"