3 files changed, 51 insertions, 14 deletions

diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 7d98a8fbf20d..b64ab1eff2a6 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.30 2005/09/10 05:52:02 marcus Exp $
+#   $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.40 2006/04/13 07:52:38 bland Exp $
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	2.14.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/1.4
+MASTER_SITE_SUBDIR=	sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gnome-system-tools-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,10 +22,11 @@ RUN_DEPENDS=	${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sys
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack nautilus2
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--enable-services
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -37,7 +37,7 @@ GCONF_SCHEMAS=	gnome-system-tools.schemas
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-IGNORE=	Uses symbols not present in 4.X
+IGNORE=	uses symbols not present in 4.X
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 8a73d9d3f890..dea2f0713697 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-1.4.1.tar.bz2) = 9ede7bcadde796396a30cdb5fa347f49
-SHA256 (gnome2/gnome-system-tools-1.4.1.tar.bz2) = b279e6b08989772cca3a7a1038971191ea6c8b9f26e02238c2e79b5faaedf380
-SIZE (gnome2/gnome-system-tools-1.4.1.tar.bz2) = 2045146
+MD5 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 3aded3a37f4f5b4962bf253d25cebea1
+SHA256 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 39f37363001b1cc2f5d2f5d2d7024a7a36e7dd227862b1dd9ce8c3325157ea7c
+SIZE (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 2120911
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 9d5c574cdcdc..acbf5571d27a 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -73,13 +73,20 @@ share/gnome/applications/users.desktop
 share/gnome/help/boot-admin/C/boot-admin.xml
 share/gnome/help/boot-admin/C/figures/boot-tool.png
 share/gnome/help/boot-admin/C/legal.xml
+share/gnome/help/boot-admin/es/boot-admin.xml
+share/gnome/help/boot-admin/es/figures/boot-tool.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/es/figures/network-tool.png
+share/gnome/help/network-admin/es/network-admin.xml
 share/gnome/help/services-admin/C/figures/service-properties.png
 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/es/figures/service-properties.png
+share/gnome/help/services-admin/es/figures/services-tool.png
+share/gnome/help/services-admin/es/services-admin.xml
 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
@@ -89,6 +96,10 @@ share/gnome/help/time-admin/C/figures/time-servers.png
 share/gnome/help/time-admin/C/figures/time-tool.png
 share/gnome/help/time-admin/C/legal.xml
 share/gnome/help/time-admin/C/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.png
+share/gnome/help/time-admin/es/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
@@ -97,13 +108,20 @@ share/gnome/help/time-admin/nl/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/omf/gnome-system-tools/boot-admin-C.omf
-share/gnome/omf/gnome-system-tools/network-admin-C.omf
-share/gnome/omf/gnome-system-tools/services-admin-C.omf
+share/gnome/help/users-admin/es/figures/users-tool.png
+share/gnome/help/users-admin/es/users-admin.xml
+share/gnome/omf/boot-admin/boot-admin-C.omf
+share/gnome/omf/boot-admin/boot-admin-es.omf
 share/gnome/omf/gnome-system-tools/services-admin-nl.omf
-share/gnome/omf/gnome-system-tools/time-admin-C.omf
 share/gnome/omf/gnome-system-tools/time-admin-nl.omf
-share/gnome/omf/gnome-system-tools/users-admin-C.omf
+share/gnome/omf/network-admin/network-admin-C.omf
+share/gnome/omf/network-admin/network-admin-es.omf
+share/gnome/omf/services-admin/services-admin-C.omf
+share/gnome/omf/services-admin/services-admin-es.omf
+share/gnome/omf/time-admin/time-admin-C.omf
+share/gnome/omf/time-admin/time-admin-es.omf
+share/gnome/omf/users-admin/users-admin-C.omf
+share/gnome/omf/users-admin/users-admin-es.omf
 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
@@ -111,6 +129,7 @@ share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
 share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
+share/locale/cy/LC_MESSAGES/gnome-system-tools.mo
 share/locale/da/LC_MESSAGES/gnome-system-tools.mo
 share/locale/de/LC_MESSAGES/gnome-system-tools.mo
 share/locale/el/LC_MESSAGES/gnome-system-tools.mo
@@ -164,26 +183,44 @@ share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
 share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
 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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrm share/gnome/omf/users-admin
+@dirrm share/gnome/omf/time-admin
+@dirrm share/gnome/omf/services-admin
+@dirrm share/gnome/omf/network-admin
 @dirrm share/gnome/omf/gnome-system-tools
+@dirrm share/gnome/omf/boot-admin
 @dirrm share/gnome/help/users-admin/C/figures
 @dirrm share/gnome/help/users-admin/C
+@dirrm share/gnome/help/users-admin/es/figures
+@dirrm share/gnome/help/users-admin/es
 @dirrm share/gnome/help/users-admin
 @dirrm share/gnome/help/time-admin/nl/figures
 @dirrm share/gnome/help/time-admin/nl
+@dirrm share/gnome/help/time-admin/es/figures
+@dirrm share/gnome/help/time-admin/es
 @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/services-admin/nl/figures
 @dirrm share/gnome/help/services-admin/nl
+@dirrm share/gnome/help/services-admin/es/figures
+@dirrm share/gnome/help/services-admin/es
 @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/es/figures
+@dirrm share/gnome/help/network-admin/es
 @dirrm share/gnome/help/network-admin/C/figures
 @dirrm share/gnome/help/network-admin/C
 @dirrm share/gnome/help/network-admin
+@dirrm share/gnome/help/boot-admin/es/figures
+@dirrm share/gnome/help/boot-admin/es
 @dirrm share/gnome/help/boot-admin/C/figures
 @dirrm share/gnome/help/boot-admin/C
 @dirrm share/gnome/help/boot-admin