update to 2.32.0

This switches to the gnome-2.32 release branch.

4 files changed, 30 insertions, 9 deletions

diff --git a/devel/GConf/Makefile.common b/devel/GConf/Makefile.common
index 22d10025a8a..b2e69d5b052 100644
--- a/devel/GConf/Makefile.common
+++ b/devel/GConf/Makefile.common
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.12 2010/06/11 13:19:24 drochner Exp $
+# $NetBSD: Makefile.common,v 1.13 2010/11/15 19:55:10 drochner Exp $
 #
 # used by devel/GConf/Makefile
 # used by devel/GConf-ui/Makefile
 
-GCONF_VERSION=		2.28.1
+GCONF_VERSION=		2.32.0
 
 DISTNAME=		GConf-${GCONF_VERSION}
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.28/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.32/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index 0285c3a25d8..b25c1aec3f2 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.30 2010/06/11 13:19:24 drochner Exp $
+@comment $NetBSD: PLIST,v 1.31 2010/11/15 19:55:10 drochner Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
+bin/gsettings-data-convert
+bin/gsettings-schema-convert
 include/gconf/2/gconf/gconf-changeset.h
 include/gconf/2/gconf/gconf-client.h
 include/gconf/2/gconf/gconf-engine.h
@@ -12,17 +14,21 @@ include/gconf/2/gconf/gconf-value.h
 include/gconf/2/gconf/gconf.h
 lib/GConf/2/libgconfbackend-oldxml.la
 lib/GConf/2/libgconfbackend-xml.la
+lib/gio/modules/libgsettingsgconfbackend.la
 lib/libgconf-2.la
 lib/pkgconfig/gconf-2.0.pc
 libexec/gconfd-2
 man/man1/gconftool-2.1
+man/man1/gsettings-data-convert.1
+man/man1/gsettings-schema-convert.1
 share/aclocal/gconf-2.m4
 share/dbus-1/services/org.gnome.GConf.service
+share/examples/GConf/autostart/gsettings-data-convert.desktop
 share/examples/GConf/path
 share/gtk-doc/html/gconf/ch01.html
-share/gtk-doc/html/gconf/gconf-GConfClient.html
 share/gtk-doc/html/gconf/gconf-gconf-backend.html
 share/gtk-doc/html/gconf/gconf-gconf-changeset.html
+share/gtk-doc/html/gconf/gconf-gconf-client.html
 share/gtk-doc/html/gconf/gconf-gconf-engine.html
 share/gtk-doc/html/gconf/gconf-gconf-error.html
 share/gtk-doc/html/gconf/gconf-gconf-internals.html
@@ -75,6 +81,7 @@ share/locale/he/LC_MESSAGES/GConf2.mo
 share/locale/hi/LC_MESSAGES/GConf2.mo
 share/locale/hr/LC_MESSAGES/GConf2.mo
 share/locale/hu/LC_MESSAGES/GConf2.mo
+share/locale/hy/LC_MESSAGES/GConf2.mo
 share/locale/id/LC_MESSAGES/GConf2.mo
 share/locale/is/LC_MESSAGES/GConf2.mo
 share/locale/it/LC_MESSAGES/GConf2.mo
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index f73459a099f..b5e19c560ec 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.27 2010/06/11 13:19:24 drochner Exp $
+$NetBSD: distinfo,v 1.28 2010/11/15 19:55:10 drochner Exp $
 
-SHA1 (GConf-2.28.1.tar.bz2) = 944e067a85b43e7a778b9ee244f85508931a49a0
-RMD160 (GConf-2.28.1.tar.bz2) = 9ee3b6e68553997a128ca2b49992ddfbe157609b
-Size (GConf-2.28.1.tar.bz2) = 1476141 bytes
+SHA1 (GConf-2.32.0.tar.bz2) = 2711c7b53761d2c789112bb1f989f1c1a6de5265
+RMD160 (GConf-2.32.0.tar.bz2) = 9ef6adca69e5ac8e2386f28f5af8e8c5c9fbb52e
+Size (GConf-2.32.0.tar.bz2) = 1541688 bytes
 SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
 SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a
 SHA1 (patch-ae) = ec5b872713e3a5aec222ad46e6f24e27fff51a86
 SHA1 (patch-af) = 6c32965505db5d0b2e1083e629c7bc7f0cd0a439
 SHA1 (patch-ag) = d9a4347443f114785f236c76881cce1b8881c81d
 SHA1 (patch-ah) = 66485f9aeef7e6023c60f58cc054924f3cac4972
+SHA1 (patch-ai) = 4fcb2effbb4e668262d2dfff6ca2875eb42d0521
diff --git a/devel/GConf/patches/patch-ai b/devel/GConf/patches/patch-ai
new file mode 100644
index 00000000000..9a9ae11620f
--- /dev/null
+++ b/devel/GConf/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2010/11/15 19:55:10 drochner Exp $
+
+--- gsettings/Makefile.in.orig	2010-09-27 18:04:55.000000000 +0000
++++ gsettings/Makefile.in
+@@ -351,7 +351,7 @@ gsettings_data_convert_LDADD = \
+ 	$(GSETTINGS_LIBS)                   \
+ 	$(NULL)
+ 
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(prefix)/share/examples/GConf/autostart
+ autostart_DATA = gsettings-data-convert.desktop
+ man_MANS = \
+ 	gsettings-schema-convert.1 \