8 files changed, 50 insertions, 62 deletions

diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 6d3799d618fc..127fd1c3f2c8 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	0.90.0
-PORTREVISION=	1
+PORTVERSION=	0.91.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/0.90
+MASTER_SITE_SUBDIR=	sources/gnome-system-tools/0.91
 DISTNAME=	gnome-system-tools-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -25,4 +24,13 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 500000
+CONFIGURE_ARGS+=	--enable-services
+PLIST_SUB+=		SERVICES=""
+.else
+PLIST_SUB+=		SERVICES="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index a2cadcfbae2a..78c8bd7796a2 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome-system-tools-0.90.0.tar.bz2) = d3aa306ac76a5cd543985aab87b6a278
-SIZE (gnome-system-tools-0.90.0.tar.bz2) = 2368812
+MD5 (gnome-system-tools-0.91.0.tar.bz2) = 51678f1b479a10a731deef7c27d82e35
+SIZE (gnome-system-tools-0.91.0.tar.bz2) = 2483587
diff --git a/sysutils/gnome-system-tools/files/patch-backends_xml.pl.in b/sysutils/gnome-system-tools/files/patch-backends_xml.pl.in
deleted file mode 100644
index 7edd3edb1608..000000000000
--- a/sysutils/gnome-system-tools/files/patch-backends_xml.pl.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- backends/xml.pl.in.orig	Sun Aug 15 12:24:15 2004
-+++ backends/xml.pl.in	Sun Aug 15 12:24:58 2004
-@@ -37,12 +37,10 @@
- 
- use Text::ParseWords;
- 
--eval "use Encode";
--$has_encode = ($@ eq "");
--
--if ($has_encode)
--{
--  use Encode;
-+$has_encode = 0;
-+if (eval "require Encode") {
-+  Encode->import( );
-+  $has_encode = 1;
- }
- 
- # --- XML print formatting  --- #
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index ed6e90a0fe47..27ff45f90a50 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -1,11 +1,9 @@
-bin/boot-admin
 bin/network-admin
-bin/services-admin
+%%SERVICES%%bin/services-admin
 bin/time-admin
 bin/users-admin
-etc/X11/sysconfig/boot.desktop
 etc/X11/sysconfig/network.desktop
-etc/X11/sysconfig/services.desktop
+%%SERVICES%%etc/X11/sysconfig/services.desktop
 etc/X11/sysconfig/time.desktop
 etc/X11/sysconfig/users.desktop
 @unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-tools.schemas > /dev/null || /usr/bin/true
@@ -53,6 +51,7 @@ share/gnome-system-tools/pixmaps/server.png
 share/gnome-system-tools/pixmaps/services.png
 share/gnome-system-tools/pixmaps/settings.png
 share/gnome-system-tools/pixmaps/slackware.png
+share/gnome-system-tools/pixmaps/specifix.png
 share/gnome-system-tools/pixmaps/suse.png
 share/gnome-system-tools/pixmaps/talk-userlist.png
 share/gnome-system-tools/pixmaps/time.png
@@ -61,12 +60,12 @@ share/gnome-system-tools/pixmaps/turbolinux.png
 share/gnome-system-tools/pixmaps/unsupported-distro.png
 share/gnome-system-tools/pixmaps/users-groups.png
 share/gnome-system-tools/pixmaps/users.png
+share/gnome-system-tools/pixmaps/vine.png
 share/gnome-system-tools/pixmaps/wavelan-16.png
 share/gnome-system-tools/pixmaps/wavelan-48.png
 share/gnome-system-tools/pixmaps/world_map-960.png
-share/gnome/applications/boot.desktop
 share/gnome/applications/network.desktop
-share/gnome/applications/services.desktop
+%%SERVICES%%share/gnome/applications/services.desktop
 share/gnome/applications/time.desktop
 share/gnome/applications/users.desktop
 share/gnome/help/boot-admin/C/boot-admin.xml
@@ -101,6 +100,8 @@ share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/az/LC_MESSAGES/gnome-system-tools.mo
 share/locale/az/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
+share/locale/bn/LC_MESSAGES/setup-tools-backends.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/cs/LC_MESSAGES/setup-tools-backends.mo
@@ -120,6 +121,8 @@ share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
 share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
 share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
+share/locale/gu/LC_MESSAGES/setup-tools-backends.mo
+share/locale/gu/LC_MESSAGES/gnome-system-tools.mo
 share/locale/hr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/hr/LC_MESSAGES/setup-tools-backends.mo
 share/locale/hu/LC_MESSAGES/gnome-system-tools.mo
@@ -140,6 +143,8 @@ share/locale/nl/LC_MESSAGES/setup-tools-backends.mo
 share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
 share/locale/no/LC_MESSAGES/gnome-system-tools.mo
 share/locale/no/LC_MESSAGES/setup-tools-backends.mo
+share/locale/pa/LC_MESSAGES/setup-tools-backends.mo
+share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pl/LC_MESSAGES/setup-tools-backends.mo
 share/locale/pt/LC_MESSAGES/gnome-system-tools.mo
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index 6d3799d618fc..127fd1c3f2c8 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	0.90.0
-PORTREVISION=	1
+PORTVERSION=	0.91.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/0.90
+MASTER_SITE_SUBDIR=	sources/gnome-system-tools/0.91
 DISTNAME=	gnome-system-tools-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -25,4 +24,13 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 500000
+CONFIGURE_ARGS+=	--enable-services
+PLIST_SUB+=		SERVICES=""
+.else
+PLIST_SUB+=		SERVICES="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo
index a2cadcfbae2a..78c8bd7796a2 100644
--- a/sysutils/gnomesystemtools/distinfo
+++ b/sysutils/gnomesystemtools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome-system-tools-0.90.0.tar.bz2) = d3aa306ac76a5cd543985aab87b6a278
-SIZE (gnome-system-tools-0.90.0.tar.bz2) = 2368812
+MD5 (gnome-system-tools-0.91.0.tar.bz2) = 51678f1b479a10a731deef7c27d82e35
+SIZE (gnome-system-tools-0.91.0.tar.bz2) = 2483587
diff --git a/sysutils/gnomesystemtools/files/patch-backends_xml.pl.in b/sysutils/gnomesystemtools/files/patch-backends_xml.pl.in
deleted file mode 100644
index 7edd3edb1608..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_xml.pl.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- backends/xml.pl.in.orig	Sun Aug 15 12:24:15 2004
-+++ backends/xml.pl.in	Sun Aug 15 12:24:58 2004
-@@ -37,12 +37,10 @@
- 
- use Text::ParseWords;
- 
--eval "use Encode";
--$has_encode = ($@ eq "");
--
--if ($has_encode)
--{
--  use Encode;
-+$has_encode = 0;
-+if (eval "require Encode") {
-+  Encode->import( );
-+  $has_encode = 1;
- }
- 
- # --- XML print formatting  --- #
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index ed6e90a0fe47..27ff45f90a50 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -1,11 +1,9 @@
-bin/boot-admin
 bin/network-admin
-bin/services-admin
+%%SERVICES%%bin/services-admin
 bin/time-admin
 bin/users-admin
-etc/X11/sysconfig/boot.desktop
 etc/X11/sysconfig/network.desktop
-etc/X11/sysconfig/services.desktop
+%%SERVICES%%etc/X11/sysconfig/services.desktop
 etc/X11/sysconfig/time.desktop
 etc/X11/sysconfig/users.desktop
 @unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-tools.schemas > /dev/null || /usr/bin/true
@@ -53,6 +51,7 @@ share/gnome-system-tools/pixmaps/server.png
 share/gnome-system-tools/pixmaps/services.png
 share/gnome-system-tools/pixmaps/settings.png
 share/gnome-system-tools/pixmaps/slackware.png
+share/gnome-system-tools/pixmaps/specifix.png
 share/gnome-system-tools/pixmaps/suse.png
 share/gnome-system-tools/pixmaps/talk-userlist.png
 share/gnome-system-tools/pixmaps/time.png
@@ -61,12 +60,12 @@ share/gnome-system-tools/pixmaps/turbolinux.png
 share/gnome-system-tools/pixmaps/unsupported-distro.png
 share/gnome-system-tools/pixmaps/users-groups.png
 share/gnome-system-tools/pixmaps/users.png
+share/gnome-system-tools/pixmaps/vine.png
 share/gnome-system-tools/pixmaps/wavelan-16.png
 share/gnome-system-tools/pixmaps/wavelan-48.png
 share/gnome-system-tools/pixmaps/world_map-960.png
-share/gnome/applications/boot.desktop
 share/gnome/applications/network.desktop
-share/gnome/applications/services.desktop
+%%SERVICES%%share/gnome/applications/services.desktop
 share/gnome/applications/time.desktop
 share/gnome/applications/users.desktop
 share/gnome/help/boot-admin/C/boot-admin.xml
@@ -101,6 +100,8 @@ share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/az/LC_MESSAGES/gnome-system-tools.mo
 share/locale/az/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
+share/locale/bn/LC_MESSAGES/setup-tools-backends.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/cs/LC_MESSAGES/setup-tools-backends.mo
@@ -120,6 +121,8 @@ share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
 share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
 share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
+share/locale/gu/LC_MESSAGES/setup-tools-backends.mo
+share/locale/gu/LC_MESSAGES/gnome-system-tools.mo
 share/locale/hr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/hr/LC_MESSAGES/setup-tools-backends.mo
 share/locale/hu/LC_MESSAGES/gnome-system-tools.mo
@@ -140,6 +143,8 @@ share/locale/nl/LC_MESSAGES/setup-tools-backends.mo
 share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
 share/locale/no/LC_MESSAGES/gnome-system-tools.mo
 share/locale/no/LC_MESSAGES/setup-tools-backends.mo
+share/locale/pa/LC_MESSAGES/setup-tools-backends.mo
+share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pl/LC_MESSAGES/setup-tools-backends.mo
 share/locale/pt/LC_MESSAGES/gnome-system-tools.mo