diff --git a/x11/gnome/system-tools/Makefile b/x11/gnome/system-tools/Makefile
index 5a106d2fd27..cb7d2803f1f 100644
--- a/x11/gnome/system-tools/Makefile
+++ b/x11/gnome/system-tools/Makefile
@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2010/09/22 16:10:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2010/09/30 07:38:53 ajacoutot Exp $
COMMENT= sytem configuration GUI for desktops
GNOME_PROJECT= gnome-system-tools
-GNOME_VERSION= 2.30.2
-
-REVISION= 0
+GNOME_VERSION= 2.32.0
CATEGORIES= sysutils
@@ -17,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
+WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto
WANTLIB += dbus-1 dbus-glib-1 expat fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
@@ -27,8 +25,7 @@ WANTLIB += xcb xcb-render xcb-render-util z eggdbus-1 nautilus-extension
WANTLIB += polkit-gobject-1 polkit-gtk-1
MODULES= devel/gettext \
- x11/gnome \
- devel/gconf2
+ x11/gnome
LIB_DEPENDS= ::devel/liboobs \
::x11/polkit-gnome \
diff --git a/x11/gnome/system-tools/distinfo b/x11/gnome/system-tools/distinfo
index 4a8e5a26b91..a7c40cb0a24 100644
--- a/x11/gnome/system-tools/distinfo
+++ b/x11/gnome/system-tools/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/gnome-system-tools-2.30.2.tar.bz2) = khFRYWiqFxs0gj2MWMgH1A==
-RMD160 (gnome/gnome-system-tools-2.30.2.tar.bz2) = kfDoRmRok9jpb6TycQFhTW+3iP8=
-SHA1 (gnome/gnome-system-tools-2.30.2.tar.bz2) = psv0oBHJubNIsCDU6HoOKnmAY1U=
-SHA256 (gnome/gnome-system-tools-2.30.2.tar.bz2) = 7l2UWjL+li01dMBzQW7pUNdw4WqH3sLVG41N1lIeiA0=
-SIZE (gnome/gnome-system-tools-2.30.2.tar.bz2) = 5401601
+MD5 (gnome/gnome-system-tools-2.32.0.tar.bz2) = k+PSGwQcdx1KwSMH5O8zkg==
+RMD160 (gnome/gnome-system-tools-2.32.0.tar.bz2) = nRclCgvAWfXLMZMBmRouqaFVGtk=
+SHA1 (gnome/gnome-system-tools-2.32.0.tar.bz2) = t8r3KJk2pfoy8CcXTTm7OZp1i94=
+SHA256 (gnome/gnome-system-tools-2.32.0.tar.bz2) = cdUmmMy2C8B9bk5EK3yxeOvxFSOWN5UA317GLaTE0Uo=
+SIZE (gnome/gnome-system-tools-2.32.0.tar.bz2) = 5433090
diff --git a/x11/gnome/system-tools/patches/patch-configure b/x11/gnome/system-tools/patches/patch-configure
new file mode 100644
index 00000000000..4c95c2a1f39
--- /dev/null
+++ b/x11/gnome/system-tools/patches/patch-configure
@@ -0,0 +1,17 @@
+$OpenBSD: patch-configure,v 1.1 2010/09/30 07:38:53 ajacoutot Exp $
+
+Bug 627126 - gsettings schema files don't get installed on FreeBSD
+
+--- configure.orig Tue Sep 28 17:22:36 2010
++++ configure Tue Sep 28 17:23:00 2010
+@@ -13173,8 +13173,8 @@ install-data-am: install-gsettings-schemas
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
diff --git a/x11/gnome/system-tools/patches/patch-interfaces_time_ui b/x11/gnome/system-tools/patches/patch-interfaces_time_ui
index 7da543ab7c2..1f5b4906ce1 100644
--- a/x11/gnome/system-tools/patches/patch-interfaces_time_ui
+++ b/x11/gnome/system-tools/patches/patch-interfaces_time_ui
@@ -1,11 +1,11 @@
-$OpenBSD: patch-interfaces_time_ui,v 1.2 2010/09/10 14:48:55 ajacoutot Exp $
+$OpenBSD: patch-interfaces_time_ui,v 1.3 2010/09/30 07:38:53 ajacoutot Exp $
XXX Do not display NTP configuration/synchronisation, it requires
"services" support.
---- interfaces/time.ui.orig Thu Feb 11 12:05:29 2010
-+++ interfaces/time.ui Fri Sep 10 16:20:56 2010
-@@ -360,7 +360,7 @@
+--- interfaces/time.ui.orig Thu Jul 1 12:29:55 2010
++++ interfaces/time.ui Tue Sep 28 17:17:46 2010
+@@ -364,7 +364,7 @@
1
-@@ -585,44 +585,6 @@
+@@ -589,44 +589,6 @@
4
diff --git a/x11/gnome/system-tools/patches/patch-src_time_time-tool_c b/x11/gnome/system-tools/patches/patch-src_time_time-tool_c
index 96eac71c998..612ed5004bf 100644
--- a/x11/gnome/system-tools/patches/patch-src_time_time-tool_c
+++ b/x11/gnome/system-tools/patches/patch-src_time_time-tool_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-src_time_time-tool_c,v 1.1 2010/09/10 14:48:55 ajacoutot Exp $
+$OpenBSD: patch-src_time_time-tool_c,v 1.2 2010/09/30 07:38:53 ajacoutot Exp $
XXX Do not display NTP configuration/synchronisation, it requires
"services" support.
---- src/time/time-tool.c.orig Fri Sep 10 16:35:45 2010
-+++ src/time/time-tool.c Fri Sep 10 16:35:52 2010
-@@ -562,10 +562,6 @@ gst_time_tool_constructor (GType type
+--- src/time/time-tool.c.orig Mon May 24 19:09:57 2010
++++ src/time/time-tool.c Tue Sep 28 17:17:46 2010
+@@ -557,10 +557,6 @@ gst_time_tool_constructor (GType type
init_timezone (time_tool);
add_options_combo (time_tool);
diff --git a/x11/gnome/system-tools/pkg/PLIST b/x11/gnome/system-tools/pkg/PLIST
index bb33ed37dd8..b06c351707c 100644
--- a/x11/gnome/system-tools/pkg/PLIST
+++ b/x11/gnome/system-tools/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/09/22 16:10:19 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/09/30 07:38:53 ajacoutot Exp $
%%SHARED%%
@comment @bin bin/network-admin
@bin bin/shares-admin
@@ -18,6 +18,9 @@ share/examples/gnome-system-tools/gnome-system-tools/
@sample ${SYSCONFDIR}/gnome-system-tools/
share/examples/gnome-system-tools/gnome-system-tools/user-profiles.conf
@sample ${SYSCONFDIR}/gnome-system-tools/user-profiles.conf
+share/glib-2.0/
+share/glib-2.0/schemas/
+share/glib-2.0/schemas/org.gnome.system-tools.gschema.xml
share/gnome-system-tools/
share/gnome-system-tools/pixmaps/
share/gnome-system-tools/pixmaps/world_map-960.png
@@ -112,6 +115,10 @@ share/gnome/help/services-admin/fr/
share/gnome/help/services-admin/fr/figures/
share/gnome/help/services-admin/fr/figures/services-tool.png
share/gnome/help/services-admin/fr/services-admin.xml
+share/gnome/help/services-admin/gl/
+share/gnome/help/services-admin/gl/figures/
+share/gnome/help/services-admin/gl/figures/services-tool.png
+share/gnome/help/services-admin/gl/services-admin.xml
share/gnome/help/services-admin/it/
share/gnome/help/services-admin/it/figures/
share/gnome/help/services-admin/it/figures/services-tool.png
@@ -175,6 +182,10 @@ share/gnome/help/shares-admin/fr/
share/gnome/help/shares-admin/fr/figures/
share/gnome/help/shares-admin/fr/figures/shares-tool.png
share/gnome/help/shares-admin/fr/shares-admin.xml
+share/gnome/help/shares-admin/gl/
+share/gnome/help/shares-admin/gl/figures/
+share/gnome/help/shares-admin/gl/figures/shares-tool.png
+share/gnome/help/shares-admin/gl/shares-admin.xml
share/gnome/help/shares-admin/it/
share/gnome/help/shares-admin/it/figures/
share/gnome/help/shares-admin/it/figures/shares-tool.png
@@ -253,6 +264,13 @@ share/gnome/help/time-admin/fr/figures/time-servers.png
share/gnome/help/time-admin/fr/figures/time-tool-automatic.png
share/gnome/help/time-admin/fr/figures/time-tool-manual.png
share/gnome/help/time-admin/fr/time-admin.xml
+share/gnome/help/time-admin/gl/
+share/gnome/help/time-admin/gl/figures/
+share/gnome/help/time-admin/gl/figures/time-map.png
+share/gnome/help/time-admin/gl/figures/time-servers.png
+share/gnome/help/time-admin/gl/figures/time-tool-automatic.png
+share/gnome/help/time-admin/gl/figures/time-tool-manual.png
+share/gnome/help/time-admin/gl/time-admin.xml
share/gnome/help/time-admin/it/
share/gnome/help/time-admin/it/figures/
share/gnome/help/time-admin/it/figures/time-map.png
@@ -344,6 +362,11 @@ share/gnome/help/users-admin/fr/figures/
share/gnome/help/users-admin/fr/figures/groups.png
share/gnome/help/users-admin/fr/figures/users-tool.png
share/gnome/help/users-admin/fr/users-admin.xml
+share/gnome/help/users-admin/gl/
+share/gnome/help/users-admin/gl/figures/
+share/gnome/help/users-admin/gl/figures/groups.png
+share/gnome/help/users-admin/gl/figures/users-tool.png
+share/gnome/help/users-admin/gl/users-admin.xml
share/gnome/help/users-admin/it/
share/gnome/help/users-admin/it/figures/
share/gnome/help/users-admin/it/figures/groups.png
@@ -418,6 +441,7 @@ share/locale/el/LC_MESSAGES/gnome-system-tools.mo
share/locale/en@shaw/LC_MESSAGES/gnome-system-tools.mo
share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo
share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo
+share/locale/eo/LC_MESSAGES/gnome-system-tools.mo
share/locale/es/LC_MESSAGES/gnome-system-tools.mo
share/locale/et/LC_MESSAGES/gnome-system-tools.mo
share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
@@ -474,6 +498,7 @@ share/locale/ta/LC_MESSAGES/gnome-system-tools.mo
share/locale/te/LC_MESSAGES/gnome-system-tools.mo
share/locale/th/LC_MESSAGES/gnome-system-tools.mo
share/locale/tr/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ug/LC_MESSAGES/gnome-system-tools.mo
share/locale/uk/LC_MESSAGES/gnome-system-tools.mo
share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
@@ -506,6 +531,7 @@ share/omf/services-admin/services-admin-el.omf
share/omf/services-admin/services-admin-en_GB.omf
share/omf/services-admin/services-admin-es.omf
share/omf/services-admin/services-admin-fr.omf
+share/omf/services-admin/services-admin-gl.omf
share/omf/services-admin/services-admin-it.omf
share/omf/services-admin/services-admin-oc.omf
share/omf/services-admin/services-admin-pl.omf
@@ -521,6 +547,7 @@ share/omf/shares-admin/shares-admin-el.omf
share/omf/shares-admin/shares-admin-en_GB.omf
share/omf/shares-admin/shares-admin-es.omf
share/omf/shares-admin/shares-admin-fr.omf
+share/omf/shares-admin/shares-admin-gl.omf
share/omf/shares-admin/shares-admin-it.omf
share/omf/shares-admin/shares-admin-oc.omf
share/omf/shares-admin/shares-admin-pt_BR.omf
@@ -535,6 +562,7 @@ share/omf/time-admin/time-admin-el.omf
share/omf/time-admin/time-admin-en_GB.omf
share/omf/time-admin/time-admin-es.omf
share/omf/time-admin/time-admin-fr.omf
+share/omf/time-admin/time-admin-gl.omf
share/omf/time-admin/time-admin-it.omf
share/omf/time-admin/time-admin-oc.omf
share/omf/time-admin/time-admin-pt_BR.omf
@@ -550,17 +578,16 @@ share/omf/users-admin/users-admin-el.omf
share/omf/users-admin/users-admin-en_GB.omf
share/omf/users-admin/users-admin-es.omf
share/omf/users-admin/users-admin-fr.omf
+share/omf/users-admin/users-admin-gl.omf
share/omf/users-admin/users-admin-it.omf
share/omf/users-admin/users-admin-oc.omf
share/omf/users-admin/users-admin-pt_BR.omf
share/omf/users-admin/users-admin-ru.omf
share/omf/users-admin/users-admin-sv.omf
share/omf/users-admin/users-admin-zh_CN.omf
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
-${SCHEMAS_INSTDIR}/
-${SCHEMAS_INSTDIR}/gnome-system-tools.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
+@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database