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.116
retrieving revision 1.137
diff -u -p -r1.116 -r1.137
--- pkgsrc/devel/glib2/Makefile	2007/07/19 21:25:46	1.116
+++ pkgsrc/devel/glib2/Makefile	2008/05/19 19:08:36	1.137
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.116 2007/07/19 21:25:46 wiz Exp $
+# $NetBSD: Makefile,v 1.137 2008/05/19 19:08:36 tnn Exp $
 
-DISTNAME=		glib-2.12.13
+# When updating glib2, please apply patch-ak to configure.in
+# Then run a matching version of autoconf to regen patch-aa.
+DISTNAME=		glib-2.16.3
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+PKGREVISION=		2
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.12/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.12/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.12/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.16/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.16/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.16/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://www.gtk.org/docs/glib_toc.html
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://developer.gnome.org/doc/API/2.0/glib/glib.html
 COMMENT=		Some useful routines for C programming (glib2)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
@@ -32,23 +35,30 @@ PKGCONFIG_OVERRIDE+=	gobject-2.0-uninsta
 PKGCONFIG_OVERRIDE+=	gobject-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gthread-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-unix-2.0.pc.in
 
 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}
 
 CONFIGURE_ENV+=		PERL_PATH=${PERL5:Q}
 
-.include "options.mk"
-
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "NetBSD"
+# configure detects wrongly
+CONFIGURE_ENV+=		ac_cv_func_statfs=no
+.endif
+
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
 CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
@@ -71,6 +81,20 @@ SUBST_MESSAGE.thr=	Fixing libgthread.
 CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
 .endif
 
+.if ${OPSYS} == "IRIX"
+SUBST_CLASSES+=			fam-linkage
+SUBST_STAGE.fam-linkage=	pre-configure
+SUBST_MESSAGE.fam-linkage=	Fixing fam linkage
+SUBST_FILES.fam-linkage=	gio/fam/Makefile.in
+SUBST_SED.fam-linkage=		-e 's,^FAM_LIBS =.*$$,FAM_LIBS = -lfam -lC,g'
+
+BUILDLINK_TRANSFORM+=		l:fam:fam:C
+.endif
+
+.if ${OPSYS} == "HPUX"
+CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
+.endif
+
 # Handle directories shared with devel/glib.
 PRINT_PLIST_AWK+=	/^@dirrm include\/glib$$/ \
 				{ print "@unexec $${RMDIR} %D/" $$2 \
@@ -79,10 +103,19 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/glib
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CONFIGURE_ARGS+=	--disable-threads
 .else
 .include "../../mk/pthread.buildlink3.mk"
 .endif
+.include "../../devel/pcre/buildlink3.mk"
+PLIST_VARS+=		fam
+.if ${OPSYS} == "HPUX"
+CONFIGURE_ARGS+=	--disable-fam
+.else
+PLIST.fam=		yes
+FAM_ACCEPTED=		fam
+. include "../../mk/fam.buildlink3.mk"
+.endif
 
 .include "../../mk/bsd.pkg.mk"