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.150
retrieving revision 1.158
diff -u -p -r1.150 -r1.158
--- pkgsrc/devel/glib2/Makefile	2008/12/01 13:25:47	1.150
+++ pkgsrc/devel/glib2/Makefile	2009/04/28 19:41:11	1.158
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.150 2008/12/01 13:25:47 wiz 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.18.3
-PKGREVISION=		1
+DISTNAME=		glib-2.20.1
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
-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/}
+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
@@ -75,6 +73,11 @@ SUBST_MESSAGE.thr=	Fixing libgthread.
 CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
 .endif
 
+# Workaround for Bug#562310
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
+TOOLS_NOOP+=		gtkdoc-rebase
+.endif
+
 .if ${OPSYS} == "HPUX"
 CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
 .endif