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.126
retrieving revision 1.135
diff -u -p -r1.126 -r1.135
--- pkgsrc/devel/glib2/Makefile	2007/11/08 19:52:21	1.126
+++ pkgsrc/devel/glib2/Makefile	2008/04/29 18:58:40	1.135
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.126 2007/11/08 19:52:21 drochner Exp $
+# $NetBSD: Makefile,v 1.135 2008/04/29 18:58:40 drochner 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.3
+DISTNAME=		glib-2.16.3
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+PKGREVISION=		1
 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}
@@ -49,10 +52,13 @@ CONFIGURE_ENV+=		F77=${FALSE:Q}
 
 CONFIGURE_ENV+=		PERL_PATH=${PERL5:Q}
 
-CONFIGURE_ENV+=		ac_cv_func_posix_memalign=no
-
 .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}\""
@@ -87,11 +93,19 @@ 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"
+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"