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.158
diff -u -p -r1.137 -r1.158
--- pkgsrc/devel/glib2/Makefile	2008/05/19 19:08:36	1.137
+++ pkgsrc/devel/glib2/Makefile	2009/04/28 19:41:11	1.158
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.137 2008/05/19 19:08:36 tnn Exp $
+# $NetBSD: Makefile,v 1.158 2009/04/28 19:41:11 zafer 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.20.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.20/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -44,11 +42,6 @@ CONFIGURE_ARGS+=	--includedir=${PREFIX}/
 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}
 
@@ -64,7 +57,6 @@ CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCAL
 CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
 .if ${OPSYS} == "FreeBSD"
-
 SUBST_CLASSES+=		thr
 SUBST_STAGE.thr=	post-patch
 SUBST_FILES.thr=	gthread/Makefile.in
@@ -81,14 +73,9 @@ 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
+# Workaround for Bug#562310
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
+TOOLS_NOOP+=		gtkdoc-rebase
 .endif
 
 .if ${OPSYS} == "HPUX"
@@ -100,22 +87,23 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/glib
 				{ print "@unexec $${RMDIR} %D/" $$2 \
 				  " 2>/dev/null || $${TRUE}"; next; }
 
+PLIST_VARS+=		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
+# need pcre utf8 + unicode-properties
+BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
 .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"