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.155
retrieving revision 1.166
diff -u -p -r1.155 -r1.166
--- pkgsrc/devel/glib2/Makefile	2009/03/15 13:32:31	1.155
+++ pkgsrc/devel/glib2/Makefile	2009/10/15 11:46:25	1.166
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.155 2009/03/15 13:32:31 jmcneill Exp $
+# $NetBSD: Makefile,v 1.166 2009/10/15 11:46:25 hasso 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.20.0
+DISTNAME=		glib-2.22.2
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.20/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.20/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.20/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.22/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.22/}
 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
@@ -74,20 +74,14 @@ SUBST_MESSAGE.thr=	Fixing libgthread.
 CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
 .endif
 
-# Workaround for Bug#562310
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
+# Workaround for Upstream Bug#562310.
+# for more detail, see also PR#41475.
 TOOLS_NOOP+=		gtkdoc-rebase
-.endif
 
 .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
 
 .if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1"