Switch glib2 from PTL2 to pth.

Introduce USE_PTL2 so that PTL2 can still be used as an alternative (e.g.
for debugging).
Only include ptl2/buildlink2.mk if USE_PTL2 is set and no native threads
are available.
Bump PKGREVISIONS.

9 files changed, 30 insertions, 24 deletions

diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index bbe818080ea..1c0235b2b80 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/16 03:14:42 rh Exp $
 #
 
 DISTNAME=		bonobo-activation-1.0.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/bonobo-activation/}
 EXTRACT_SUFX=		.tar.bz2
@@ -21,6 +21,6 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 
 .include "../../textproc/libxml2/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../net/ORBit2/buildlink2.mk"
-.include "../../devel/ptl2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bonobo-activation/buildlink2.mk b/devel/bonobo-activation/buildlink2.mk
index dd793650a77..e5ca9e169da 100644
--- a/devel/bonobo-activation/buildlink2.mk
+++ b/devel/bonobo-activation/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/09/22 09:52:34 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/10/16 03:14:42 rh Exp $
 
 .if !defined(BONOBO_ACTIVATION_BUILDLINK2_MK)
 BONOBO_ACTIVATION_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=				bonobo-activation
-BUILDLINK_DEPENDS.bonobo-activation?=		bonobo-activation>=1.0.2nb1
+BUILDLINK_DEPENDS.bonobo-activation?=		bonobo-activation>=1.0.2nb2
 BUILDLINK_PKGSRCDIR.bonobo-activation?=		../../devel/bonobo-activation
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.bonobo-activation=bonobo-activation
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index f85d319f511..e24c2f2d783 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2002/09/11 11:31:40 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/16 03:14:41 rh Exp $
 #
 
 DISTNAME=		glib-2.0.6
 PKGNAME=		${DISTNAME:S/glib/glib2/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
@@ -26,8 +26,11 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
-# GLib needs a working pre-emptive pthreads implementation
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(USE_PTL2)
 PTHREAD_OPTS+=		native
+.endif
 
 test: build
 	cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk
index 606f196a16b..aa89899b812 100644
--- a/devel/glib2/buildlink2.mk
+++ b/devel/glib2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/09/23 02:28:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2002/10/16 03:14:41 rh Exp $
 
 .if !defined(GLIB2_BUILDLINK2_MK)
 GLIB2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		glib2
-BUILDLINK_DEPENDS.glib2?=	glib2>=2.0.6nb1
+BUILDLINK_DEPENDS.glib2?=	glib2>=2.0.6nb2
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.glib2=glib2
@@ -21,7 +21,11 @@ BUILDLINK_FILES.glib2+=	lib/libgthread-2.0.*
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(USE_PTL2)
 PTHREAD_OPTS+=	native
+.endif
 
 .include "../../mk/pthread.buildlink2.mk"
 
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 0899a95a9e5..93caf9aa4a9 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/09/10 16:06:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/16 03:14:43 rh Exp $
 
 DISTNAME=		libbonobo-2.0.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/libbonobo/}
 EXTRACT_SUFX=		.tar.bz2
@@ -17,5 +17,5 @@ USE_GMAKE=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../devel/bonobo-activation/buildlink2.mk"
-.include "../../devel/ptl2/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 481dfc10bc8..1e93c42d4cf 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/09/12 04:19:50 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/16 03:14:44 rh Exp $
 #
 
 DISTNAME=		libgnomeprint-1.116.0
+PKGREVISION=		1
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/libgnomeprint/}
 
@@ -26,7 +27,7 @@ pre-configure:
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/pango/buildlink2.mk"
-.include "../../devel/ptl2/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/libart2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprint/buildlink2.mk b/print/libgnomeprint/buildlink2.mk
index 921f4a23dd1..a3b77461325 100644
--- a/print/libgnomeprint/buildlink2.mk
+++ b/print/libgnomeprint/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/09/22 09:52:36 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/10/16 03:14:44 rh Exp $
 
 .if !defined(LIBGNOMEPRINT_BUILDLINK2_MK)
 LIBGNOMEPRINT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgnomeprint
-BUILDLINK_DEPENDS.libgnomeprint?=	libgnomeprint>=1.116.0
+BUILDLINK_DEPENDS.libgnomeprint?=	libgnomeprint>=1.116.0nb1
 BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libgnomeprint=libgnomeprint
@@ -17,7 +17,7 @@ BUILDLINK_FILES.libgnomeprint+=	lib/libgnomeprint-2.*
 
 .include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/pango/buildlink2.mk"
-.include "../../devel/ptl2/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/libart2/buildlink2.mk"
 
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index 55219cbede6..c3eeedc48d1 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/09/11 23:07:50 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/16 03:14:44 rh Exp $
 #
 
 DISTNAME=		gnome-vfs-2.0.4
 PKGNAME=		${DISTNAME:S/vfs/vfs2/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.1/sources/gnome-vfs/}
 EXTRACT_SUFX=		.tar.bz2
@@ -33,7 +33,6 @@ CONFIGURE_ARGS+=	--enable-platform-gnome-2
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/bonobo-activation/buildlink2.mk"
-.include "../../devel/ptl2/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../net/ORBit2/buildlink2.mk"
diff --git a/sysutils/gnome-vfs2/buildlink2.mk b/sysutils/gnome-vfs2/buildlink2.mk
index 99249acba3d..772d31c5fb6 100644
--- a/sysutils/gnome-vfs2/buildlink2.mk
+++ b/sysutils/gnome-vfs2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/22 09:52:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/10/16 03:14:44 rh Exp $
 
 .if !defined(GNOME_VFS2_BUILDLINK2_MK)
 GNOME_VFS2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gnome-vfs2
-BUILDLINK_DEPENDS.gnome-vfs2?=	gnome-vfs2>=2.0.4
+BUILDLINK_DEPENDS.gnome-vfs2?=	gnome-vfs2>=2.0.4nb2
 BUILDLINK_PKGSRCDIR.gnome-vfs2?=	../../sysutils/gnome-vfs2
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.gnome-vfs2=gnome-vfs2
@@ -23,7 +23,6 @@ BUILDLINK_FILES.gnome-vfs2+=	lib/libgnomevfs-2.*
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/bonobo-activation/buildlink2.mk"
-.include "../../devel/ptl2/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../net/ORBit2/buildlink2.mk"