update to 2.22.0

This switches to the gnome-2.22 release branch.

4 files changed, 20 insertions, 13 deletions

diff --git a/devel/GConf/Makefile.common b/devel/GConf/Makefile.common
index cd4ea6e2bca..45d450fdaab 100644
--- a/devel/GConf/Makefile.common
+++ b/devel/GConf/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.2 2007/10/31 19:46:17 drochner Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/04/10 16:27:47 drochner Exp $
 #
 
-GCONF_VERSION=		2.20.1
+GCONF_VERSION=		2.22.0
 
 DISTNAME=		GConf-${GCONF_VERSION}
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index 8d8a39a9794..3594078c639 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/10/31 19:46:17 drochner Exp $
+@comment $NetBSD: PLIST,v 1.24 2008/04/10 16:27:47 drochner Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -42,6 +42,7 @@ share/gtk-doc/html/gconf/style.css
 share/gtk-doc/html/gconf/up.png
 share/locale/am/LC_MESSAGES/GConf2.mo
 share/locale/ar/LC_MESSAGES/GConf2.mo
+share/locale/as/LC_MESSAGES/GConf2.mo
 share/locale/az/LC_MESSAGES/GConf2.mo
 share/locale/be/LC_MESSAGES/GConf2.mo
 share/locale/bg/LC_MESSAGES/GConf2.mo
@@ -83,6 +84,7 @@ share/locale/mg/LC_MESSAGES/GConf2.mo
 share/locale/mk/LC_MESSAGES/GConf2.mo
 share/locale/ml/LC_MESSAGES/GConf2.mo
 share/locale/mn/LC_MESSAGES/GConf2.mo
+share/locale/mr/LC_MESSAGES/GConf2.mo
 share/locale/ms/LC_MESSAGES/GConf2.mo
 share/locale/nb/LC_MESSAGES/GConf2.mo
 share/locale/ne/LC_MESSAGES/GConf2.mo
@@ -97,6 +99,7 @@ share/locale/pt_BR/LC_MESSAGES/GConf2.mo
 share/locale/ro/LC_MESSAGES/GConf2.mo
 share/locale/ru/LC_MESSAGES/GConf2.mo
 share/locale/rw/LC_MESSAGES/GConf2.mo
+share/locale/si/LC_MESSAGES/GConf2.mo
 share/locale/sk/LC_MESSAGES/GConf2.mo
 share/locale/sl/LC_MESSAGES/GConf2.mo
 share/locale/sq/LC_MESSAGES/GConf2.mo
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index 706d07faf92..3b7a53cfbd8 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2007/10/31 19:46:17 drochner Exp $
+$NetBSD: distinfo,v 1.18 2008/04/10 16:27:47 drochner Exp $
 
-SHA1 (GConf-2.20.1.tar.bz2) = c628e2645a91b15749f1ebacc62ea685cbfa681c
-RMD160 (GConf-2.20.1.tar.bz2) = 743bee341731402e5d4938ee030adf4f463d9a52
-Size (GConf-2.20.1.tar.bz2) = 1404919 bytes
+SHA1 (GConf-2.22.0.tar.bz2) = 2a9ca649ef58394e425a030dc99b863b499a8a56
+RMD160 (GConf-2.22.0.tar.bz2) = 71f0c6f20882681efdffc957f6d86affd4a29a80
+Size (GConf-2.22.0.tar.bz2) = 1416685 bytes
 SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
-SHA1 (patch-ac) = 1a1989511b9bb78f0310e70289b54ed326dede1b
+SHA1 (patch-ac) = de94ecba73ae748f609f4e4790df8eb856793d7b
 SHA1 (patch-ad) = 5d90ad4651d4c2562277c9008a3056568afe7317
diff --git a/devel/GConf/patches/patch-ac b/devel/GConf/patches/patch-ac
index ac003f91c2b..9dd60dbd6c6 100644
--- a/devel/GConf/patches/patch-ac
+++ b/devel/GConf/patches/patch-ac
@@ -1,13 +1,17 @@
-$NetBSD: patch-ac,v 1.9 2007/09/21 12:58:14 wiz Exp $
+$NetBSD: patch-ac,v 1.10 2008/04/10 16:27:47 drochner Exp $
 
---- gconf/Makefile.in.orig	2006-10-05 12:54:51.000000000 +0000
+--- gconf/Makefile.in.orig	2008-03-10 15:54:18.000000000 +0100
 +++ gconf/Makefile.in
-@@ -818,8 +818,8 @@ default.path: $(srcdir)/default.path.in
+@@ -795,12 +795,8 @@ default.path: $(srcdir)/default.path.in
  		<$(srcdir)/default.path.in >default.path
  
  install-data-local: default.path
 -	$(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
--	$(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
+-	if test -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; then				\
+-		echo "Existing path configuration file not changed";				\
+-	else 											\
+-		$(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path;	\
+-	fi
 +	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/GConf
 +	$(INSTALL_DATA) default.path $(DESTDIR)$(datadir)/examples/GConf/path