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.139
retrieving revision 1.163
diff -u -p -r1.139 -r1.163
--- pkgsrc/devel/glib2/Makefile	2008/05/28 21:20:48	1.139
+++ pkgsrc/devel/glib2/Makefile	2009/06/14 22:57:59	1.163
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.139 2008/05/28 21:20:48 joerg Exp $
+# $NetBSD: Makefile,v 1.163 2009/06/14 22:57:59 joerg 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.3
 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
 HOMEPAGE=		http://developer.gnome.org/doc/API/2.0/glib/glib.html
 COMMENT=		Some useful routines for C programming (glib2)
+LICENSE=		gnu-lgpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -44,11 +43,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 +58,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,20 +74,16 @@ SUBST_MESSAGE.thr=	Fixing libgthread.
 CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
 .endif
 
+# Workaround for Upstream Bug#562310.
+# for more detail, see also PR#41475.
+TOOLS_NOOP+=		gtkdoc-rebase
+
 .if ${OPSYS} == "HPUX"
 CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
 .endif
 
-# Handle directories shared with devel/glib.
-PRINT_PLIST_AWK+=	/^@dirrm include\/glib$$/ \
-				{ print "@unexec $${RMDIR} %D/" $$2 \
-				  " 2>/dev/null || $${TRUE}"; next; }
-
 PLIST_VARS+=		fam
 
-# Overriden in options.mk.
-CONFIGURE_ARGS+=	--disable-fam
-
 .if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1"
 .include "options.mk"
 .endif
@@ -108,6 +97,8 @@ 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"
 
 .include "../../mk/bsd.pkg.mk"