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.134
retrieving revision 1.144
diff -u -p -r1.134 -r1.144
--- pkgsrc/devel/glib2/Makefile	2008/04/13 13:15:59	1.134
+++ pkgsrc/devel/glib2/Makefile	2008/07/28 15:27:21	1.144
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.134 2008/04/13 13:15:59 tnn Exp $
+# $NetBSD: Makefile,v 1.144 2008/07/28 15:27:21 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.16.3
+DISTNAME=		glib-2.16.5
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.16/ \
@@ -89,22 +89,24 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/glib
 				{ print "@unexec $${RMDIR} %D/" $$2 \
 				  " 2>/dev/null || $${TRUE}"; next; }
 
+PLIST_VARS+=		fam
+
+# Overridden in options.mk.
+CONFIGURE_ARGS+=	--disable-fam
+
+.if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1"
+.include "options.mk"
+.endif
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+
 .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"