4 files changed, 39 insertions, 34 deletions

diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 81bf196e48b3..2182de4117a4 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,21 +3,19 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.68 2007/09/16 16:56:43 ahze Exp $
+#   $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.78 2008/03/09 18:58:47 mezz Exp $
 #
 
 PORTNAME=	gnome-system-tools
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-system-tools-${PORTVERSION}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to configure workstations
 
-LIB_DEPENDS=	oobs-1.3:${PORTSDIR}/devel/liboobs
+LIB_DEPENDS=	oobs-1.4:${PORTSDIR}/devel/liboobs
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 1317b19b6e8d..c56c52fb6457 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 6559bb97fc75bc28b559dc530571d527
+SHA256 (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 57c348458efdf34118bc46102e2389cf32172f22e3429bb959a81a773ade56b9
+SIZE (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 3441541
diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure
deleted file mode 100644
index 303edc2c5532..000000000000
--- a/sysutils/gnome-system-tools/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2007-12-22 22:34:20.000000000 -0600
-+++ configure	2007-12-22 22:34:43.000000000 -0600
-@@ -25180,7 +25180,7 @@
- GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
- 
- GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.a $GST_LIBS"
--GST_TOOL_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/src/common"
-+GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS"
- 
- GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in"
- GST_TOOL_EXTRA_DIST="\$(toolpixmaps) \$(desktop).in.in"
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 95534a249571..3d2ede7481a5 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -3,24 +3,22 @@ bin/services-admin
 bin/shares-admin
 bin/time-admin
 bin/users-admin
-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
+lib/nautilus/extensions-2.0/libnautilus-gst-shares.a
+lib/nautilus/extensions-2.0/libnautilus-gst-shares.la
+lib/nautilus/extensions-2.0/libnautilus-gst-shares.so
 libdata/pkgconfig/gnome-system-tools.pc
 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
+%%DATADIR%%/ui/common.ui
+%%DATADIR%%/ui/network.ui
+%%DATADIR%%/ui/services.ui
+%%DATADIR%%/ui/shares.ui
+%%DATADIR%%/ui/time.ui
+%%DATADIR%%/ui/users.ui
 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
@@ -39,6 +37,8 @@ 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/el/figures/services-tool.png
+share/gnome/help/services-admin/el/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
@@ -87,7 +87,7 @@ 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/nl/figures/time-map.png
 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/figures/time-tool-manual.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
@@ -110,6 +110,8 @@ 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/el/figures/users-tool.png
+share/gnome/help/users-admin/el/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
@@ -120,8 +122,14 @@ 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/icons/hicolor/16x16/apps/time-admin.png
+share/icons/hicolor/22x22/apps/time-admin.png
+share/icons/hicolor/24x24/apps/time-admin.png
+share/icons/hicolor/32x32/apps/time-admin.png
+share/icons/hicolor/48x48/apps/time-admin.png
 share/icons/hicolor/48x48/devices/irda.png
 share/icons/hicolor/48x48/devices/plip.png
+share/icons/hicolor/scalable/apps/time-admin.svg
 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
@@ -164,6 +172,7 @@ share/locale/mg/LC_MESSAGES/gnome-system-tools.mo
 share/locale/mk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ml/LC_MESSAGES/gnome-system-tools.mo
 share/locale/mn/LC_MESSAGES/gnome-system-tools.mo
+share/locale/mr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ms/LC_MESSAGES/gnome-system-tools.mo
 share/locale/nb/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ne/LC_MESSAGES/gnome-system-tools.mo
@@ -180,6 +189,7 @@ 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/sl/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sq/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-system-tools.mo
@@ -204,6 +214,7 @@ 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-el.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
@@ -223,6 +234,7 @@ 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-el.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
@@ -244,6 +256,8 @@ share/omf/users-admin/users-admin-sv.omf
 @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/el/figures
+@dirrm share/gnome/help/users-admin/el
 @dirrm share/gnome/help/users-admin/ca/figures
 @dirrm share/gnome/help/users-admin/ca
 @dirrm share/gnome/help/users-admin/C/figures
@@ -289,6 +303,8 @@ share/omf/users-admin/users-admin-sv.omf
 @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/el/figures
+@dirrm share/gnome/help/services-admin/el
 @dirrm share/gnome/help/services-admin/ca/figures
 @dirrm share/gnome/help/services-admin/ca
 @dirrm share/gnome/help/services-admin/C/figures
@@ -307,9 +323,10 @@ share/omf/users-admin/users-admin-sv.omf
 @dirrm share/gnome/help/network-admin/C/figures
 @dirrm share/gnome/help/network-admin/C
 @dirrm share/gnome/help/network-admin
+@dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/interfaces
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -320,6 +337,8 @@ share/omf/users-admin/users-admin-sv.omf
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -330,4 +349,3 @@ share/omf/users-admin/users-admin-sv.omf
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/applications