Update to 2.3.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@930 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 26 insertions, 78 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index ae09cd307..f92964ae1 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.3.2
-#PORTREVISIION=	0
-PORTREVISION=	1
+PORTVERSION=	2.3.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.3
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 27367a434..09a319d55 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.3.2.tar.bz2) = d2dfe082624a5ac7294e8bb1a64fe6c3
+MD5 (gnome2/control-center-2.3.3.tar.bz2) = b4e0cf31aaf6f755f82b8548bbda9cc3
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c
deleted file mode 100644
index 169ae0cbf..000000000
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gnome-settings-daemon/gnome-settings-xrdb.c.orig	Fri May  9 11:55:44 2003
-+++ gnome-settings-daemon/gnome-settings-xrdb.c	Fri May  9 11:55:58 2003
-@@ -251,6 +251,7 @@
- append_xresources (GString *string, GError **error)
- {
- 	const char* home_path;
-+	char *xresources;
- 
- 	g_return_if_fail (string != NULL);
- 
-@@ -259,7 +260,7 @@
- 		g_warning (_("Cannot determine user's home directory"));
- 		return;
- 	}
--	char *xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL);
-+	xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL);
- 	if (g_file_test (xresources, G_FILE_TEST_EXISTS)) {
- 		append_file (xresources, string, error);
- 		if (*error) {
diff --git a/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c
index 45a72ff27..a9add20e2 100644
--- a/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c
+++ b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c
@@ -1,5 +1,5 @@
---- vfs-methods/themus/theme-method.c.orig	Thu May 22 01:42:21 2003
-+++ vfs-methods/themus/theme-method.c	Thu May 22 01:44:13 2003
+--- vfs-methods/themus/theme-method.c.orig	Fri Jun 13 07:52:44 2003
++++ vfs-methods/themus/theme-method.c	Sat Jun 28 12:50:39 2003
 @@ -19,6 +19,7 @@
  
  #include <string.h>
@@ -8,13 +8,3 @@
  #include <sys/stat.h>
  #include <sys/types.h>
  
-@@ -528,8 +529,8 @@
- 		return GNOME_VFS_OK;
- 	}
- 	else {
--		g_free (path);
- 		GnomeThemeMetaInfo *theme;
-+		g_free (path);
- 		
- 		theme = theme_meta_info_find (uri);
- 		if (theme)
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index c751426b4..0d4043a15 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -97,10 +97,10 @@ share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
 share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
 share/gnome/control-center-2.0/interfaces/sound-properties.glade
 share/gnome/control-center-2.0/interfaces/theme-install.glade
 share/gnome/control-center-2.0/interfaces/theme-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
@@ -120,11 +120,13 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png
 share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png
 share/gnome/control-center-2.0/pixmaps/mouse-left.png
 share/gnome/control-center-2.0/pixmaps/mouse-right.png
+share/gnome/control-center-2.0/pixmaps/sound-capplet.png
 share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
 share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
 share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png
 share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png
 share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png
+share/gnome/control-center-2.0/pixmaps/visual-bell.png
 share/gnome/control-center-2.0/xrdb/Editres.ad
 share/gnome/control-center-2.0/xrdb/Emacs.ad
 share/gnome/control-center-2.0/xrdb/General.ad
@@ -146,6 +148,7 @@ share/gnome/pixmaps/control-center2.png
 share/gnome/pixmaps/default-applications-capplet.png
 share/gnome/pixmaps/display-capplet.png
 share/gnome/pixmaps/font-capplet.png
+share/gnome/pixmaps/gnome-ccthemes.png
 share/gnome/pixmaps/gnomecc-2/active.png
 share/gnome/pixmaps/gnomecc-2/bcg_top.png
 share/gnome/pixmaps/gnomecc-2/blank.png
@@ -153,7 +156,6 @@ share/gnome/pixmaps/gnomecc-2/title.png
 share/gnome/pixmaps/keyboard-capplet.png
 share/gnome/pixmaps/keyboard-shortcut.png
 share/gnome/pixmaps/mouse-capplet.png
-share/gnome/pixmaps/sound-capplet.png
 share/gnome/pixmaps/window-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
@@ -164,6 +166,7 @@ share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
 share/locale/be/LC_MESSAGES/control-center-2.0.mo
 share/locale/bg/LC_MESSAGES/control-center-2.0.mo
+share/locale/bn/LC_MESSAGES/control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/control-center-2.0.mo
 share/locale/cs/LC_MESSAGES/control-center-2.0.mo
 share/locale/da/LC_MESSAGES/control-center-2.0.mo
@@ -180,6 +183,7 @@ share/locale/gl/LC_MESSAGES/control-center-2.0.mo
 share/locale/he/LC_MESSAGES/control-center-2.0.mo
 share/locale/hr/LC_MESSAGES/control-center-2.0.mo
 share/locale/hu/LC_MESSAGES/control-center-2.0.mo
+share/locale/id/LC_MESSAGES/control-center-2.0.mo
 share/locale/it/LC_MESSAGES/control-center-2.0.mo
 share/locale/ja/LC_MESSAGES/control-center-2.0.mo
 share/locale/ko/LC_MESSAGES/control-center-2.0.mo
@@ -204,6 +208,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
 share/locale/sv/LC_MESSAGES/control-center-2.0.mo
 share/locale/ta/LC_MESSAGES/control-center-2.0.mo
+share/locale/th/LC_MESSAGES/control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/control-center-2.0.mo
 share/locale/uk/LC_MESSAGES/control-center-2.0.mo
 share/locale/vi/LC_MESSAGES/control-center-2.0.mo
@@ -219,8 +224,8 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
@@ -229,8 +234,8 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index ae09cd307..f92964ae1 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.3.2
-#PORTREVISIION=	0
-PORTREVISION=	1
+PORTVERSION=	2.3.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.3
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 27367a434..09a319d55 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.3.2.tar.bz2) = d2dfe082624a5ac7294e8bb1a64fe6c3
+MD5 (gnome2/control-center-2.3.3.tar.bz2) = b4e0cf31aaf6f755f82b8548bbda9cc3
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c
deleted file mode 100644
index 169ae0cbf..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gnome-settings-daemon/gnome-settings-xrdb.c.orig	Fri May  9 11:55:44 2003
-+++ gnome-settings-daemon/gnome-settings-xrdb.c	Fri May  9 11:55:58 2003
-@@ -251,6 +251,7 @@
- append_xresources (GString *string, GError **error)
- {
- 	const char* home_path;
-+	char *xresources;
- 
- 	g_return_if_fail (string != NULL);
- 
-@@ -259,7 +260,7 @@
- 		g_warning (_("Cannot determine user's home directory"));
- 		return;
- 	}
--	char *xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL);
-+	xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL);
- 	if (g_file_test (xresources, G_FILE_TEST_EXISTS)) {
- 		append_file (xresources, string, error);
- 		if (*error) {
diff --git a/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c b/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c
index 45a72ff27..a9add20e2 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c
@@ -1,5 +1,5 @@
---- vfs-methods/themus/theme-method.c.orig	Thu May 22 01:42:21 2003
-+++ vfs-methods/themus/theme-method.c	Thu May 22 01:44:13 2003
+--- vfs-methods/themus/theme-method.c.orig	Fri Jun 13 07:52:44 2003
++++ vfs-methods/themus/theme-method.c	Sat Jun 28 12:50:39 2003
 @@ -19,6 +19,7 @@
  
  #include <string.h>
@@ -8,13 +8,3 @@
  #include <sys/stat.h>
  #include <sys/types.h>
  
-@@ -528,8 +529,8 @@
- 		return GNOME_VFS_OK;
- 	}
- 	else {
--		g_free (path);
- 		GnomeThemeMetaInfo *theme;
-+		g_free (path);
- 		
- 		theme = theme_meta_info_find (uri);
- 		if (theme)
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index c751426b4..0d4043a15 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -97,10 +97,10 @@ share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
 share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
 share/gnome/control-center-2.0/interfaces/sound-properties.glade
 share/gnome/control-center-2.0/interfaces/theme-install.glade
 share/gnome/control-center-2.0/interfaces/theme-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
@@ -120,11 +120,13 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png
 share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png
 share/gnome/control-center-2.0/pixmaps/mouse-left.png
 share/gnome/control-center-2.0/pixmaps/mouse-right.png
+share/gnome/control-center-2.0/pixmaps/sound-capplet.png
 share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
 share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
 share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png
 share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png
 share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png
+share/gnome/control-center-2.0/pixmaps/visual-bell.png
 share/gnome/control-center-2.0/xrdb/Editres.ad
 share/gnome/control-center-2.0/xrdb/Emacs.ad
 share/gnome/control-center-2.0/xrdb/General.ad
@@ -146,6 +148,7 @@ share/gnome/pixmaps/control-center2.png
 share/gnome/pixmaps/default-applications-capplet.png
 share/gnome/pixmaps/display-capplet.png
 share/gnome/pixmaps/font-capplet.png
+share/gnome/pixmaps/gnome-ccthemes.png
 share/gnome/pixmaps/gnomecc-2/active.png
 share/gnome/pixmaps/gnomecc-2/bcg_top.png
 share/gnome/pixmaps/gnomecc-2/blank.png
@@ -153,7 +156,6 @@ share/gnome/pixmaps/gnomecc-2/title.png
 share/gnome/pixmaps/keyboard-capplet.png
 share/gnome/pixmaps/keyboard-shortcut.png
 share/gnome/pixmaps/mouse-capplet.png
-share/gnome/pixmaps/sound-capplet.png
 share/gnome/pixmaps/window-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
@@ -164,6 +166,7 @@ share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
 share/locale/be/LC_MESSAGES/control-center-2.0.mo
 share/locale/bg/LC_MESSAGES/control-center-2.0.mo
+share/locale/bn/LC_MESSAGES/control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/control-center-2.0.mo
 share/locale/cs/LC_MESSAGES/control-center-2.0.mo
 share/locale/da/LC_MESSAGES/control-center-2.0.mo
@@ -180,6 +183,7 @@ share/locale/gl/LC_MESSAGES/control-center-2.0.mo
 share/locale/he/LC_MESSAGES/control-center-2.0.mo
 share/locale/hr/LC_MESSAGES/control-center-2.0.mo
 share/locale/hu/LC_MESSAGES/control-center-2.0.mo
+share/locale/id/LC_MESSAGES/control-center-2.0.mo
 share/locale/it/LC_MESSAGES/control-center-2.0.mo
 share/locale/ja/LC_MESSAGES/control-center-2.0.mo
 share/locale/ko/LC_MESSAGES/control-center-2.0.mo
@@ -204,6 +208,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
 share/locale/sv/LC_MESSAGES/control-center-2.0.mo
 share/locale/ta/LC_MESSAGES/control-center-2.0.mo
+share/locale/th/LC_MESSAGES/control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/control-center-2.0.mo
 share/locale/uk/LC_MESSAGES/control-center-2.0.mo
 share/locale/vi/LC_MESSAGES/control-center-2.0.mo
@@ -219,8 +224,8 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
@@ -229,8 +234,8 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf