4 files changed, 33 insertions, 30 deletions

diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 579d384b054d..a54d417a7092 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.88 2009/10/19 18:43:32 kwm Exp $
+#   $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.97 2010/04/27 17:44:05 kwm Exp $
 #
 
 PORTNAME=	gnome-system-tools
-PORTVERSION=	2.28.2
-PORTREVISION=	2
+PORTVERSION=	2.30.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 0e35df51b97c..8fb8a76b1b78 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-2.28.2.tar.bz2) = 6947cd83c8f83af54e76a36ab3bb6cf0
-SHA256 (gnome2/gnome-system-tools-2.28.2.tar.bz2) = 806dd14792149b7f01e84a214b8d6debda53965e1eb74d189c66498adeb2af29
-SIZE (gnome2/gnome-system-tools-2.28.2.tar.bz2) = 5307176
+MD5 (gnome2/gnome-system-tools-2.30.1.tar.bz2) = d752a0bc2e075ba6d99fbf5d609051cc
+SHA256 (gnome2/gnome-system-tools-2.30.1.tar.bz2) = c70c2282275d54793c65cffe51ad84d2586b13eb49e4c7d4fa94e7d2edbebc70
+SIZE (gnome2/gnome-system-tools-2.30.1.tar.bz2) = 5380453
diff --git a/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c b/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c
index bfc0d5eaa8b3..c9fcbb6537dd 100644
--- a/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c
+++ b/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c
@@ -1,33 +1,31 @@
---- src/users/user-settings.c.orig	2009-12-15 05:17:23.000000000 -0800
-+++ src/users/user-settings.c	2010-01-20 22:25:39.000000000 -0800
-@@ -29,7 +29,7 @@
+--- src/users/user-settings.c.orig	2010-01-11 19:53:32.000000000 +0100
++++ src/users/user-settings.c	2010-01-20 15:42:10.000000000 +0100
+@@ -31,7 +31,15 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <stdlib.h>
--#include <utmp.h>
-+#include <sys/param.h>
++#ifdef __FreeBSD__
++# include <sys/param.h>
++# if __FreeBSD_version >= 900007
++# define HAVE_UTMPX_H
++#include <utmpx.h>
++# else
+ #include <utmp.h>
++# endif
++#endif
  #include <ctype.h>
  
  #include "users-table.h"
-@@ -367,7 +367,7 @@
+@@ -274,10 +282,10 @@ static void
+ set_login_length (GtkWidget *entry)
  {
  	gint max_len;
- #ifdef __FreeBSD__
--	max_len = UT_NAMESIZE;
-+	max_len = MAXLOGNAME - 1;
+-#ifdef __FreeBSD__
++#if (defined(__FreeBSD__) && !defined(HAVE_UTMPX_H))
+ 	max_len = UT_NAMESIZE;
  #else
- 	struct utmp ut;
+-	struct utmp ut;
++	struct utmpx ut;
  
-@@ -819,10 +819,10 @@
- 		password_changed = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "changed"));
- 
- 		if (password_changed)
--			oobs_user_set_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
-+			oobs_user_set_crypted_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
- 	} else {
- 		widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_random_passwd");
--		oobs_user_set_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
-+		oobs_user_set_crypted_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
- 	}
- 
- 	group = get_main_group (oobs_user_get_login_name (user));
+ 	max_len = sizeof (ut.ut_user);
+ #endif
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 5f0f345bcae0..0bfaa9786591 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -3,6 +3,7 @@ bin/services-admin
 bin/shares-admin
 bin/time-admin
 bin/users-admin
+etc/gnome-system-tools/user-profiles.conf
 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
@@ -63,7 +64,6 @@ share/gnome/help/services-admin/fr/figures/services-tool.png
 share/gnome/help/services-admin/fr/services-admin.xml
 share/gnome/help/services-admin/it/figures/services-tool.png
 share/gnome/help/services-admin/it/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
 share/gnome/help/services-admin/nl/services-admin.xml
@@ -231,6 +231,7 @@ 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/af/LC_MESSAGES/gnome-system-tools.mo
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
 share/locale/as/LC_MESSAGES/gnome-system-tools.mo
@@ -241,6 +242,7 @@ 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
+share/locale/br/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-system-tools.mo
 share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
@@ -249,6 +251,7 @@ share/locale/da/LC_MESSAGES/gnome-system-tools.mo
 share/locale/de/LC_MESSAGES/gnome-system-tools.mo
 share/locale/dz/LC_MESSAGES/gnome-system-tools.mo
 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/es/LC_MESSAGES/gnome-system-tools.mo
@@ -536,6 +539,7 @@ share/omf/users-admin/users-admin-zh_CN.omf
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
+@dirrm etc/gnome-system-tools
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -562,6 +566,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES