Update to 2.3.3.1.

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

8 files changed, 10 insertions, 36 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 7d04f842f..13bacb7a1 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.3.3
+PORTVERSION=	2.3.3.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.3
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 10818a0aa..d23cbde12 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.3.3.tar.bz2) = e1223a33b5bac24ff252ff80ba7c88bd
+MD5 (gnome2/gnome-desktop-2.3.3.1.tar.bz2) = 67a217e750bfaef1bc8ec952d9b7e9de
diff --git a/x11/gnome-desktop/files/patch-gnome-about_gnome-about.c b/x11/gnome-desktop/files/patch-gnome-about_gnome-about.c
deleted file mode 100644
index b90284308..000000000
--- a/x11/gnome-desktop/files/patch-gnome-about_gnome-about.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnome-about/gnome-about.c.orig	Sun Jun 15 02:04:36 2003
-+++ gnome-about/gnome-about.c	Sun Jun 15 02:04:50 2003
-@@ -458,9 +458,8 @@
- 	g_list_free (files);
- 
- 	if (error) {
-+	    	char * message;
- 		g_free (directory);
--
--		char *message;
- 
- 		message = g_strdup_printf (_("Unable to load header image: %s"),
- 					   error->message);
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index fe327a90a..216bfeb3a 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -27,6 +27,8 @@ share/gnome/pixmaps/apple-red.png
 share/gnome/pixmaps/gnome-aorta.png
 share/gnome/pixmaps/gnome-applets.png
 share/gnome/pixmaps/gnome-applications.png
+share/gnome/pixmaps/gnome-background-image.png
+share/gnome/pixmaps/gnome-background-pattern.png
 share/gnome/pixmaps/gnome-background.png
 share/gnome/pixmaps/gnome-calc2.png
 share/gnome/pixmaps/gnome-calc3.png
@@ -34,12 +36,9 @@ share/gnome/pixmaps/gnome-calendar.png
 share/gnome/pixmaps/gnome-ccbackground.png
 share/gnome/pixmaps/gnome-ccdesktop.png
 share/gnome/pixmaps/gnome-ccdialog.png
-share/gnome/pixmaps/gnome-cckeyboard-bell.png
-share/gnome/pixmaps/gnome-cckeyboard.png
 share/gnome/pixmaps/gnome-ccmime.png
 share/gnome/pixmaps/gnome-ccperiph.png
 share/gnome/pixmaps/gnome-ccscreensaver.png
-share/gnome/pixmaps/gnome-ccthemes.png
 share/gnome/pixmaps/gnome-ccwindowmanager.png
 share/gnome/pixmaps/gnome-color-browser.png
 share/gnome/pixmaps/gnome-color-xterm.png
@@ -114,6 +113,7 @@ share/gnome/vfolders/Graphics.directory
 share/gnome/vfolders/Internet.directory
 share/gnome/vfolders/Multimedia.directory
 share/gnome/vfolders/Office.directory
+share/gnome/vfolders/Other.directory
 share/gnome/vfolders/Root.directory
 share/gnome/vfolders/Settings.directory
 share/gnome/vfolders/System.directory
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 7d04f842f..13bacb7a1 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.3.3
+PORTVERSION=	2.3.3.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.3
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 10818a0aa..d23cbde12 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.3.3.tar.bz2) = e1223a33b5bac24ff252ff80ba7c88bd
+MD5 (gnome2/gnome-desktop-2.3.3.1.tar.bz2) = 67a217e750bfaef1bc8ec952d9b7e9de
diff --git a/x11/gnomedesktop/files/patch-gnome-about_gnome-about.c b/x11/gnomedesktop/files/patch-gnome-about_gnome-about.c
deleted file mode 100644
index b90284308..000000000
--- a/x11/gnomedesktop/files/patch-gnome-about_gnome-about.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnome-about/gnome-about.c.orig	Sun Jun 15 02:04:36 2003
-+++ gnome-about/gnome-about.c	Sun Jun 15 02:04:50 2003
-@@ -458,9 +458,8 @@
- 	g_list_free (files);
- 
- 	if (error) {
-+	    	char * message;
- 		g_free (directory);
--
--		char *message;
- 
- 		message = g_strdup_printf (_("Unable to load header image: %s"),
- 					   error->message);
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index fe327a90a..216bfeb3a 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -27,6 +27,8 @@ share/gnome/pixmaps/apple-red.png
 share/gnome/pixmaps/gnome-aorta.png
 share/gnome/pixmaps/gnome-applets.png
 share/gnome/pixmaps/gnome-applications.png
+share/gnome/pixmaps/gnome-background-image.png
+share/gnome/pixmaps/gnome-background-pattern.png
 share/gnome/pixmaps/gnome-background.png
 share/gnome/pixmaps/gnome-calc2.png
 share/gnome/pixmaps/gnome-calc3.png
@@ -34,12 +36,9 @@ share/gnome/pixmaps/gnome-calendar.png
 share/gnome/pixmaps/gnome-ccbackground.png
 share/gnome/pixmaps/gnome-ccdesktop.png
 share/gnome/pixmaps/gnome-ccdialog.png
-share/gnome/pixmaps/gnome-cckeyboard-bell.png
-share/gnome/pixmaps/gnome-cckeyboard.png
 share/gnome/pixmaps/gnome-ccmime.png
 share/gnome/pixmaps/gnome-ccperiph.png
 share/gnome/pixmaps/gnome-ccscreensaver.png
-share/gnome/pixmaps/gnome-ccthemes.png
 share/gnome/pixmaps/gnome-ccwindowmanager.png
 share/gnome/pixmaps/gnome-color-browser.png
 share/gnome/pixmaps/gnome-color-xterm.png
@@ -114,6 +113,7 @@ share/gnome/vfolders/Graphics.directory
 share/gnome/vfolders/Internet.directory
 share/gnome/vfolders/Multimedia.directory
 share/gnome/vfolders/Office.directory
+share/gnome/vfolders/Other.directory
 share/gnome/vfolders/Root.directory
 share/gnome/vfolders/Settings.directory
 share/gnome/vfolders/System.directory