Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/devel/glib2/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/devel/glib2/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1
retrieving revision 1.5
diff -u -p -r1.1 -r1.5
--- pkgsrc/devel/glib2/Makefile	2002/03/24 20:27:13	1.1
+++ pkgsrc/devel/glib2/Makefile	2002/08/01 05:48:08	1.5
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2002/03/24 20:27:13 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/01 05:48:08 jlam Exp $
 #
 
-DISTNAME=		glib-2.0.0
+DISTNAME=		glib-2.0.4
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
@@ -21,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 | \
@@ -35,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"