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.160
retrieving revision 1.171
diff -u -p -r1.160 -r1.171
--- pkgsrc/devel/glib2/Makefile	2009/05/26 16:55:23	1.160
+++ pkgsrc/devel/glib2/Makefile	2010/02/23 20:19:27	1.171
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.160 2009/05/26 16:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.171 2010/02/23 20:19:27 drochner 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.2
+DISTNAME=		glib-2.22.4
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+PKGREVISION=		2
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/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
@@ -74,20 +75,10 @@ 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
 
-# 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"
@@ -107,5 +98,4 @@ CONFIGURE_ARGS+=	--disable-threads
 BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
 .include "../../devel/pcre/buildlink3.mk"
 
-.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"