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.131
retrieving revision 1.137
diff -u -p -r1.131 -r1.137
--- pkgsrc/devel/glib2/Makefile	2008/02/21 20:53:54	1.131
+++ pkgsrc/devel/glib2/Makefile	2008/05/19 19:08:36	1.137
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.131 2008/02/21 20:53:54 tnn Exp $
+# $NetBSD: Makefile,v 1.137 2008/05/19 19:08:36 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.6
+DISTNAME=		glib-2.16.3
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+PKGREVISION=		2
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.14/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.14/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.14/}
+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=		pkgsrc-users@NetBSD.org
@@ -34,6 +35,8 @@ 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}
@@ -51,6 +54,11 @@ CONFIGURE_ENV+=		PERL_PATH=${PERL5:Q}
 
 .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}\""
@@ -73,6 +81,16 @@ 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
@@ -91,5 +109,13 @@ CONFIGURE_ARGS+=	--disable-threads
 .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"