Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

3 files changed, 122 insertions, 56 deletions

diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index e048f695e1da..52467f1877de 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,11 +3,10 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.59 2007/03/12 12:55:31 ahze Exp $
+#    $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.68 2007/09/16 16:56:43 ahze Exp $
 
 PORTNAME=	gnome-system-tools
-PORTVERSION=	2.18.1
-PORTREVISION=	2
+PORTVERSION=	2.20.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -35,8 +34,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	gnome-system-tools.schemas
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${prefix}/$${DATADIRNAME}|$${datadir}|g' \
-	    	${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 51b2ba709ede..1317b19b6e8d 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-2.18.1.tar.bz2) = e55a1a37084fe4f5739109e00af81b86
-SHA256 (gnome2/gnome-system-tools-2.18.1.tar.bz2) = 3f591326901f5c9457a670484d5264f286df55f7f274878cf9edd19d8991f7e7
-SIZE (gnome2/gnome-system-tools-2.18.1.tar.bz2) = 2845382
+MD5 (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 382ed1f5ad4cb6ce7b88985611e2be18
+SHA256 (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 5635b305322ee4d1e2dddd3a9b9f4b29f195663f4c51e77428f81f6bbd325581
+SIZE (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 3226583
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 6865d5fc1355..95534a249571 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -7,32 +7,38 @@ lib/nautilus/extensions-1.0/libnautilus-gst-shares.a
 lib/nautilus/extensions-1.0/libnautilus-gst-shares.la
 lib/nautilus/extensions-1.0/libnautilus-gst-shares.so
 libdata/pkgconfig/gnome-system-tools.pc
-share/gnome/applications/network.desktop
-share/gnome/applications/services.desktop
-share/gnome/applications/shares.desktop
-share/gnome/applications/time.desktop
-share/gnome/applications/users.desktop
-share/gnome/gnome-system-tools/interfaces/boot.glade
-share/gnome/gnome-system-tools/interfaces/common.glade
-share/gnome/gnome-system-tools/interfaces/disks.glade
-share/gnome/gnome-system-tools/interfaces/network.glade
-share/gnome/gnome-system-tools/interfaces/services.glade
-share/gnome/gnome-system-tools/interfaces/shares.glade
-share/gnome/gnome-system-tools/interfaces/time.glade
-share/gnome/gnome-system-tools/interfaces/users.glade
-share/gnome/gnome-system-tools/pixmaps/world_map-960.png
+share/applications/network.desktop
+share/applications/services.desktop
+share/applications/shares.desktop
+share/applications/time.desktop
+share/applications/users.desktop
+%%DATADIR%%/interfaces/boot.glade
+%%DATADIR%%/interfaces/common.glade
+%%DATADIR%%/interfaces/disks.glade
+%%DATADIR%%/interfaces/network.glade
+%%DATADIR%%/interfaces/services.glade
+%%DATADIR%%/interfaces/shares.glade
+%%DATADIR%%/interfaces/time.glade
+%%DATADIR%%/interfaces/users.glade
+%%DATADIR%%/pixmaps/world_map-960.png
 share/gnome/help/network-admin/C/figures/network-tool.png
 share/gnome/help/network-admin/C/legal.xml
 share/gnome/help/network-admin/C/network-admin.xml
+share/gnome/help/network-admin/ca/figures/network-tool.png
+share/gnome/help/network-admin/ca/network-admin.xml
 share/gnome/help/network-admin/es/figures/network-tool.png
 share/gnome/help/network-admin/es/network-admin.xml
 share/gnome/help/network-admin/fr/figures/network-tool.png
 share/gnome/help/network-admin/fr/network-admin.xml
+share/gnome/help/network-admin/oc/figures/network-tool.png
+share/gnome/help/network-admin/oc/network-admin.xml
 share/gnome/help/network-admin/sv/figures/network-tool.png
 share/gnome/help/network-admin/sv/network-admin.xml
 share/gnome/help/services-admin/C/figures/services-tool.png
 share/gnome/help/services-admin/C/legal.xml
 share/gnome/help/services-admin/C/services-admin.xml
+share/gnome/help/services-admin/ca/figures/services-tool.png
+share/gnome/help/services-admin/ca/services-admin.xml
 share/gnome/help/services-admin/es/figures/services-tool.png
 share/gnome/help/services-admin/es/services-admin.xml
 share/gnome/help/services-admin/fr/figures/services-tool.png
@@ -41,13 +47,21 @@ share/gnome/help/services-admin/nl/figures/service-properties.png
 share/gnome/help/services-admin/nl/figures/services-tool.png
 share/gnome/help/services-admin/nl/legal.xml
 share/gnome/help/services-admin/nl/services-admin.xml
+share/gnome/help/services-admin/oc/figures/services-tool.png
+share/gnome/help/services-admin/oc/services-admin.xml
 share/gnome/help/services-admin/sv/figures/services-tool.png
 share/gnome/help/services-admin/sv/services-admin.xml
 share/gnome/help/shares-admin/C/figures/shares-tool.png
 share/gnome/help/shares-admin/C/legal.xml
 share/gnome/help/shares-admin/C/shares-admin.xml
+share/gnome/help/shares-admin/ca/figures/shares-tool.png
+share/gnome/help/shares-admin/ca/shares-admin.xml
+share/gnome/help/shares-admin/es/figures/shares-tool.png
+share/gnome/help/shares-admin/es/shares-admin.xml
 share/gnome/help/shares-admin/fr/figures/shares-tool.png
 share/gnome/help/shares-admin/fr/shares-admin.xml
+share/gnome/help/shares-admin/oc/figures/shares-tool.png
+share/gnome/help/shares-admin/oc/shares-admin.xml
 share/gnome/help/shares-admin/sv/figures/shares-tool.png
 share/gnome/help/shares-admin/sv/shares-admin.xml
 share/gnome/help/time-admin/C/figures/time-map.png
@@ -56,6 +70,11 @@ share/gnome/help/time-admin/C/figures/time-tool-automatic.png
 share/gnome/help/time-admin/C/figures/time-tool-manual.png
 share/gnome/help/time-admin/C/legal.xml
 share/gnome/help/time-admin/C/time-admin.xml
+share/gnome/help/time-admin/ca/figures/time-map.png
+share/gnome/help/time-admin/ca/figures/time-servers.png
+share/gnome/help/time-admin/ca/figures/time-tool-automatic.png
+share/gnome/help/time-admin/ca/figures/time-tool-manual.png
+share/gnome/help/time-admin/ca/time-admin.xml
 share/gnome/help/time-admin/es/figures/time-map.png
 share/gnome/help/time-admin/es/figures/time-servers.png
 share/gnome/help/time-admin/es/figures/time-tool-automatic.png
@@ -71,6 +90,11 @@ share/gnome/help/time-admin/nl/figures/time-servers.png
 share/gnome/help/time-admin/nl/figures/time-tool.png
 share/gnome/help/time-admin/nl/legal.xml
 share/gnome/help/time-admin/nl/time-admin.xml
+share/gnome/help/time-admin/oc/figures/time-map.png
+share/gnome/help/time-admin/oc/figures/time-servers.png
+share/gnome/help/time-admin/oc/figures/time-tool-automatic.png
+share/gnome/help/time-admin/oc/figures/time-tool-manual.png
+share/gnome/help/time-admin/oc/time-admin.xml
 share/gnome/help/time-admin/ru/figures/time-map.png
 share/gnome/help/time-admin/ru/figures/time-servers.png
 share/gnome/help/time-admin/ru/figures/time-tool-automatic.png
@@ -84,43 +108,25 @@ share/gnome/help/time-admin/sv/time-admin.xml
 share/gnome/help/users-admin/C/figures/users-tool.png
 share/gnome/help/users-admin/C/legal.xml
 share/gnome/help/users-admin/C/users-admin.xml
+share/gnome/help/users-admin/ca/figures/users-tool.png
+share/gnome/help/users-admin/ca/users-admin.xml
 share/gnome/help/users-admin/es/figures/users-tool.png
 share/gnome/help/users-admin/es/users-admin.xml
 share/gnome/help/users-admin/fr/figures/users-tool.png
 share/gnome/help/users-admin/fr/users-admin.xml
+share/gnome/help/users-admin/oc/figures/users-tool.png
+share/gnome/help/users-admin/oc/users-admin.xml
 share/gnome/help/users-admin/ru/figures/users-tool.png
 share/gnome/help/users-admin/ru/users-admin.xml
 share/gnome/help/users-admin/sv/figures/users-tool.png
 share/gnome/help/users-admin/sv/users-admin.xml
-share/gnome/omf/gnome-system-tools/services-admin-nl.omf
-share/gnome/omf/gnome-system-tools/time-admin-nl.omf
-share/gnome/omf/network-admin/network-admin-C.omf
-share/gnome/omf/network-admin/network-admin-es.omf
-share/gnome/omf/network-admin/network-admin-fr.omf
-share/gnome/omf/network-admin/network-admin-sv.omf
-share/gnome/omf/services-admin/services-admin-C.omf
-share/gnome/omf/services-admin/services-admin-es.omf
-share/gnome/omf/services-admin/services-admin-fr.omf
-share/gnome/omf/services-admin/services-admin-sv.omf
-share/gnome/omf/shares-admin/shares-admin-C.omf
-share/gnome/omf/shares-admin/shares-admin-fr.omf
-share/gnome/omf/shares-admin/shares-admin-sv.omf
-share/gnome/omf/time-admin/time-admin-C.omf
-share/gnome/omf/time-admin/time-admin-es.omf
-share/gnome/omf/time-admin/time-admin-fr.omf
-share/gnome/omf/time-admin/time-admin-ru.omf
-share/gnome/omf/time-admin/time-admin-sv.omf
-share/gnome/omf/users-admin/users-admin-C.omf
-share/gnome/omf/users-admin/users-admin-es.omf
-share/gnome/omf/users-admin/users-admin-fr.omf
-share/gnome/omf/users-admin/users-admin-ru.omf
-share/gnome/omf/users-admin/users-admin-sv.omf
 share/icons/hicolor/48x48/devices/irda.png
 share/icons/hicolor/48x48/devices/plip.png
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
 share/locale/az/LC_MESSAGES/gnome-system-tools.mo
 share/locale/be/LC_MESSAGES/gnome-system-tools.mo
+share/locale/be@latin/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-system-tools.mo
@@ -163,6 +169,7 @@ share/locale/nb/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ne/LC_MESSAGES/gnome-system-tools.mo
 share/locale/nl/LC_MESSAGES/gnome-system-tools.mo
 share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
+share/locale/oc/LC_MESSAGES/gnome-system-tools.mo
 share/locale/or/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
@@ -171,6 +178,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ro/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ru/LC_MESSAGES/gnome-system-tools.mo
 share/locale/rw/LC_MESSAGES/gnome-system-tools.mo
+share/locale/si/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sq/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sr/LC_MESSAGES/gnome-system-tools.mo
@@ -186,20 +194,58 @@ share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
-@dirrm share/gnome/omf/users-admin
-@dirrm share/gnome/omf/time-admin
-@dirrm share/gnome/omf/shares-admin
-@dirrm share/gnome/omf/services-admin
-@dirrm share/gnome/omf/network-admin
-@dirrm share/gnome/omf/gnome-system-tools
+share/omf/gnome-system-tools/services-admin-nl.omf
+share/omf/gnome-system-tools/time-admin-nl.omf
+share/omf/network-admin/network-admin-C.omf
+share/omf/network-admin/network-admin-ca.omf
+share/omf/network-admin/network-admin-es.omf
+share/omf/network-admin/network-admin-fr.omf
+share/omf/network-admin/network-admin-oc.omf
+share/omf/network-admin/network-admin-sv.omf
+share/omf/services-admin/services-admin-C.omf
+share/omf/services-admin/services-admin-ca.omf
+share/omf/services-admin/services-admin-es.omf
+share/omf/services-admin/services-admin-fr.omf
+share/omf/services-admin/services-admin-oc.omf
+share/omf/services-admin/services-admin-sv.omf
+share/omf/shares-admin/shares-admin-C.omf
+share/omf/shares-admin/shares-admin-ca.omf
+share/omf/shares-admin/shares-admin-es.omf
+share/omf/shares-admin/shares-admin-fr.omf
+share/omf/shares-admin/shares-admin-oc.omf
+share/omf/shares-admin/shares-admin-sv.omf
+share/omf/time-admin/time-admin-C.omf
+share/omf/time-admin/time-admin-ca.omf
+share/omf/time-admin/time-admin-es.omf
+share/omf/time-admin/time-admin-fr.omf
+share/omf/time-admin/time-admin-oc.omf
+share/omf/time-admin/time-admin-ru.omf
+share/omf/time-admin/time-admin-sv.omf
+share/omf/users-admin/users-admin-C.omf
+share/omf/users-admin/users-admin-ca.omf
+share/omf/users-admin/users-admin-es.omf
+share/omf/users-admin/users-admin-fr.omf
+share/omf/users-admin/users-admin-oc.omf
+share/omf/users-admin/users-admin-ru.omf
+share/omf/users-admin/users-admin-sv.omf
+@dirrm share/omf/users-admin
+@dirrm share/omf/time-admin
+@dirrm share/omf/shares-admin
+@dirrm share/omf/services-admin
+@dirrm share/omf/network-admin
+@dirrm share/omf/gnome-system-tools
 @dirrm share/gnome/help/users-admin/sv/figures
 @dirrm share/gnome/help/users-admin/sv
 @dirrm share/gnome/help/users-admin/ru/figures
 @dirrm share/gnome/help/users-admin/ru
+@dirrm share/gnome/help/users-admin/oc/figures
+@dirrm share/gnome/help/users-admin/oc
 @dirrm share/gnome/help/users-admin/fr/figures
 @dirrm share/gnome/help/users-admin/fr
 @dirrm share/gnome/help/users-admin/es/figures
 @dirrm share/gnome/help/users-admin/es
+@dirrm share/gnome/help/users-admin/ca/figures
+@dirrm share/gnome/help/users-admin/ca
 @dirrm share/gnome/help/users-admin/C/figures
 @dirrm share/gnome/help/users-admin/C
 @dirrm share/gnome/help/users-admin
@@ -207,51 +253,73 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
 @dirrm share/gnome/help/time-admin/sv
 @dirrm share/gnome/help/time-admin/ru/figures
 @dirrm share/gnome/help/time-admin/ru
+@dirrm share/gnome/help/time-admin/oc/figures
+@dirrm share/gnome/help/time-admin/oc
 @dirrm share/gnome/help/time-admin/nl/figures
 @dirrm share/gnome/help/time-admin/nl
 @dirrm share/gnome/help/time-admin/fr/figures
 @dirrm share/gnome/help/time-admin/fr
 @dirrm share/gnome/help/time-admin/es/figures
 @dirrm share/gnome/help/time-admin/es
+@dirrm share/gnome/help/time-admin/ca/figures
+@dirrm share/gnome/help/time-admin/ca
 @dirrm share/gnome/help/time-admin/C/figures
 @dirrm share/gnome/help/time-admin/C
 @dirrm share/gnome/help/time-admin
 @dirrm share/gnome/help/shares-admin/sv/figures
 @dirrm share/gnome/help/shares-admin/sv
+@dirrm share/gnome/help/shares-admin/oc/figures
+@dirrm share/gnome/help/shares-admin/oc
 @dirrm share/gnome/help/shares-admin/fr/figures
 @dirrm share/gnome/help/shares-admin/fr
+@dirrm share/gnome/help/shares-admin/es/figures
+@dirrm share/gnome/help/shares-admin/es
+@dirrm share/gnome/help/shares-admin/ca/figures
+@dirrm share/gnome/help/shares-admin/ca
 @dirrm share/gnome/help/shares-admin/C/figures
 @dirrm share/gnome/help/shares-admin/C
 @dirrm share/gnome/help/shares-admin
 @dirrm share/gnome/help/services-admin/sv/figures
 @dirrm share/gnome/help/services-admin/sv
+@dirrm share/gnome/help/services-admin/oc/figures
+@dirrm share/gnome/help/services-admin/oc
 @dirrm share/gnome/help/services-admin/nl/figures
 @dirrm share/gnome/help/services-admin/nl
 @dirrm share/gnome/help/services-admin/fr/figures
 @dirrm share/gnome/help/services-admin/fr
 @dirrm share/gnome/help/services-admin/es/figures
 @dirrm share/gnome/help/services-admin/es
+@dirrm share/gnome/help/services-admin/ca/figures
+@dirrm share/gnome/help/services-admin/ca
 @dirrm share/gnome/help/services-admin/C/figures
 @dirrm share/gnome/help/services-admin/C
 @dirrm share/gnome/help/services-admin
 @dirrm share/gnome/help/network-admin/sv/figures
 @dirrm share/gnome/help/network-admin/sv
+@dirrm share/gnome/help/network-admin/oc/figures
+@dirrm share/gnome/help/network-admin/oc
 @dirrm share/gnome/help/network-admin/fr/figures
 @dirrm share/gnome/help/network-admin/fr
 @dirrm share/gnome/help/network-admin/es/figures
 @dirrm share/gnome/help/network-admin/es
+@dirrm share/gnome/help/network-admin/ca/figures
+@dirrm share/gnome/help/network-admin/ca
 @dirrm share/gnome/help/network-admin/C/figures
 @dirrm share/gnome/help/network-admin/C
 @dirrm share/gnome/help/network-admin
-@dirrm share/gnome/gnome-system-tools/pixmaps
-@dirrm share/gnome/gnome-system-tools/interfaces
-@dirrm share/gnome/gnome-system-tools
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/interfaces
+@dirrm %%DATADIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -260,3 +328,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/applications