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.137
retrieving revision 1.149
diff -u -p -r1.137 -r1.149
--- pkgsrc/devel/glib2/Makefile	2008/05/19 19:08:36	1.137
+++ pkgsrc/devel/glib2/Makefile	2008/11/29 19:09:04	1.149
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.137 2008/05/19 19:08:36 tnn Exp $
+# $NetBSD: Makefile,v 1.149 2008/11/29 19:09:04 jmcneill 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.18.3
+PKGREVISION=		1
 PKGNAME=		${DISTNAME:S/glib/glib2/}
-PKGREVISION=		2
 CATEGORIES=		devel
-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/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.18/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.18/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -81,16 +81,6 @@ 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
@@ -100,22 +90,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"