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.125
retrieving revision 1.131
diff -u -p -r1.125 -r1.131
--- pkgsrc/devel/glib2/Makefile	2007/10/29 19:06:04	1.125
+++ pkgsrc/devel/glib2/Makefile	2008/02/21 20:53:54	1.131
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.125 2007/10/29 19:06:04 drochner Exp $
+# $NetBSD: Makefile,v 1.131 2008/02/21 20:53:54 tnn Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
-DISTNAME=		glib-2.14.2
+DISTNAME=		glib-2.14.6
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.14/ \
@@ -39,8 +39,10 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
-
 CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
+CONFIGURE_ARGS+=	--with-pcre=system
+# need pcre utf8 + unicode-properties
+BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE:Q}
@@ -83,10 +85,11 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/glib
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.if ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CONFIGURE_ARGS+=	--disable-threads
 .else
 .include "../../mk/pthread.buildlink3.mk"
 .endif
+.include "../../devel/pcre/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"