Update to 2.3.3.

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

8 files changed, 54 insertions, 26 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index d8c81106f..7d04f842f 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.3
 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 8e4e2b8f9..10818a0aa 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.3.2.tar.bz2) = 33c0aa6ea720f83ba9dc709b2870613c
+MD5 (gnome2/gnome-desktop-2.3.3.tar.bz2) = e1223a33b5bac24ff252ff80ba7c88bd
diff --git a/x11/gnome-desktop/files/patch-gnome-about_gnome-about.c b/x11/gnome-desktop/files/patch-gnome-about_gnome-about.c
new file mode 100644
index 000000000..b90284308
--- /dev/null
+++ b/x11/gnome-desktop/files/patch-gnome-about_gnome-about.c
@@ -0,0 +1,13 @@
+--- 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 d3cfb7b67..fe327a90a 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -6,8 +6,17 @@ lib/libgnome-desktop-2.a
 lib/libgnome-desktop-2.so
 lib/libgnome-desktop-2.so.3
 libdata/pkgconfig/gnome-desktop-2.0.pc
-share/gnome/gnome-about/contributors.dat
+share/gnome/gnome-about/gnome-64.gif
 share/gnome/gnome-about/gnome-version.xml
+share/gnome/gnome-about/headers/header-bg-ancient01a.png
+share/gnome/gnome-about/headers/header-bg-city01.png
+share/gnome/gnome-about/headers/header-bg-clouds01.png
+share/gnome/gnome-about/headers/header-bg-clouds02.png
+share/gnome/gnome-about/headers/header-bg-hills01.png
+share/gnome/gnome-about/headers/header-bg-landscape01.png
+share/gnome/gnome-about/headers/header-bg-mountains01.png
+share/gnome/gnome-about/headers/header-bg-snow01.png
+share/gnome/gnome-about/headers/header-bg-sunset01.png
 share/gnome/help/fdl/C/fdl.xml
 share/gnome/help/gnome-feedback/C/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
@@ -18,7 +27,6 @@ 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-audio2.png
 share/gnome/pixmaps/gnome-background.png
 share/gnome/pixmaps/gnome-calc2.png
 share/gnome/pixmaps/gnome-calc3.png
@@ -39,7 +47,6 @@ share/gnome/pixmaps/gnome-computer.png
 share/gnome/pixmaps/gnome-cromagnon.png
 share/gnome/pixmaps/gnome-day.png
 share/gnome/pixmaps/gnome-debian.png
-share/gnome/pixmaps/gnome-devel.png
 share/gnome/pixmaps/gnome-diskfree.png
 share/gnome/pixmaps/gnome-emacs.png
 share/gnome/pixmaps/gnome-eterm.png
@@ -49,18 +56,14 @@ share/gnome/pixmaps/gnome-file-h.png
 share/gnome/pixmaps/gnome-folder.png
 share/gnome/pixmaps/gnome-gemvt.png
 share/gnome/pixmaps/gnome-gimp.png
-share/gnome/pixmaps/gnome-globe.png
 share/gnome/pixmaps/gnome-gmenu.png
 share/gnome/pixmaps/gnome-gmush.png
 share/gnome/pixmaps/gnome-gnomoku.png
-share/gnome/pixmaps/gnome-graphics.png
-share/gnome/pixmaps/gnome-help.png
 share/gnome/pixmaps/gnome-home.png
 share/gnome/pixmaps/gnome-html.png
 share/gnome/pixmaps/gnome-image-gif.png
 share/gnome/pixmaps/gnome-image-jpeg.png
 share/gnome/pixmaps/gnome-irc.png
-share/gnome/pixmaps/gnome-joystick.png
 share/gnome/pixmaps/gnome-laptop.png
 share/gnome/pixmaps/gnome-log.png
 share/gnome/pixmaps/gnome-logo-icon-transparent.png
@@ -74,18 +77,15 @@ share/gnome/pixmaps/gnome-money.png
 share/gnome/pixmaps/gnome-monitor.png
 share/gnome/pixmaps/gnome-month.png
 share/gnome/pixmaps/gnome-mouse.png
-share/gnome/pixmaps/gnome-multimedia.png
 share/gnome/pixmaps/gnome-networktool.png
 share/gnome/pixmaps/gnome-news.png
 share/gnome/pixmaps/gnome-note.png
 share/gnome/pixmaps/gnome-qeye.png
 share/gnome/pixmaps/gnome-session.png
 share/gnome/pixmaps/gnome-set-time.png
-share/gnome/pixmaps/gnome-settings.png
 share/gnome/pixmaps/gnome-spider.png
 share/gnome/pixmaps/gnome-squeak.png
 share/gnome/pixmaps/gnome-suse.png
-share/gnome/pixmaps/gnome-system.png
 share/gnome/pixmaps/gnome-talk.png
 share/gnome/pixmaps/gnome-term-linux.png
 share/gnome/pixmaps/gnome-term-linux2.png
@@ -94,7 +94,6 @@ share/gnome/pixmaps/gnome-term-tiger.png
 share/gnome/pixmaps/gnome-term.png
 share/gnome/pixmaps/gnome-tigert.png
 share/gnome/pixmaps/gnome-touristinfo.png
-share/gnome/pixmaps/gnome-unknown.png
 share/gnome/pixmaps/gnome-user-interface.png
 share/gnome/pixmaps/gnome-util.png
 share/gnome/pixmaps/gnome-week.png
@@ -150,6 +149,7 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -185,6 +185,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
 @dirrm share/gnome/help/fdl/C/figures
+@dirrm share/gnome/gnome-about/headers
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index d8c81106f..7d04f842f 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.3
 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 8e4e2b8f9..10818a0aa 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.3.2.tar.bz2) = 33c0aa6ea720f83ba9dc709b2870613c
+MD5 (gnome2/gnome-desktop-2.3.3.tar.bz2) = e1223a33b5bac24ff252ff80ba7c88bd
diff --git a/x11/gnomedesktop/files/patch-gnome-about_gnome-about.c b/x11/gnomedesktop/files/patch-gnome-about_gnome-about.c
new file mode 100644
index 000000000..b90284308
--- /dev/null
+++ b/x11/gnomedesktop/files/patch-gnome-about_gnome-about.c
@@ -0,0 +1,13 @@
+--- 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 d3cfb7b67..fe327a90a 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -6,8 +6,17 @@ lib/libgnome-desktop-2.a
 lib/libgnome-desktop-2.so
 lib/libgnome-desktop-2.so.3
 libdata/pkgconfig/gnome-desktop-2.0.pc
-share/gnome/gnome-about/contributors.dat
+share/gnome/gnome-about/gnome-64.gif
 share/gnome/gnome-about/gnome-version.xml
+share/gnome/gnome-about/headers/header-bg-ancient01a.png
+share/gnome/gnome-about/headers/header-bg-city01.png
+share/gnome/gnome-about/headers/header-bg-clouds01.png
+share/gnome/gnome-about/headers/header-bg-clouds02.png
+share/gnome/gnome-about/headers/header-bg-hills01.png
+share/gnome/gnome-about/headers/header-bg-landscape01.png
+share/gnome/gnome-about/headers/header-bg-mountains01.png
+share/gnome/gnome-about/headers/header-bg-snow01.png
+share/gnome/gnome-about/headers/header-bg-sunset01.png
 share/gnome/help/fdl/C/fdl.xml
 share/gnome/help/gnome-feedback/C/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
@@ -18,7 +27,6 @@ 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-audio2.png
 share/gnome/pixmaps/gnome-background.png
 share/gnome/pixmaps/gnome-calc2.png
 share/gnome/pixmaps/gnome-calc3.png
@@ -39,7 +47,6 @@ share/gnome/pixmaps/gnome-computer.png
 share/gnome/pixmaps/gnome-cromagnon.png
 share/gnome/pixmaps/gnome-day.png
 share/gnome/pixmaps/gnome-debian.png
-share/gnome/pixmaps/gnome-devel.png
 share/gnome/pixmaps/gnome-diskfree.png
 share/gnome/pixmaps/gnome-emacs.png
 share/gnome/pixmaps/gnome-eterm.png
@@ -49,18 +56,14 @@ share/gnome/pixmaps/gnome-file-h.png
 share/gnome/pixmaps/gnome-folder.png
 share/gnome/pixmaps/gnome-gemvt.png
 share/gnome/pixmaps/gnome-gimp.png
-share/gnome/pixmaps/gnome-globe.png
 share/gnome/pixmaps/gnome-gmenu.png
 share/gnome/pixmaps/gnome-gmush.png
 share/gnome/pixmaps/gnome-gnomoku.png
-share/gnome/pixmaps/gnome-graphics.png
-share/gnome/pixmaps/gnome-help.png
 share/gnome/pixmaps/gnome-home.png
 share/gnome/pixmaps/gnome-html.png
 share/gnome/pixmaps/gnome-image-gif.png
 share/gnome/pixmaps/gnome-image-jpeg.png
 share/gnome/pixmaps/gnome-irc.png
-share/gnome/pixmaps/gnome-joystick.png
 share/gnome/pixmaps/gnome-laptop.png
 share/gnome/pixmaps/gnome-log.png
 share/gnome/pixmaps/gnome-logo-icon-transparent.png
@@ -74,18 +77,15 @@ share/gnome/pixmaps/gnome-money.png
 share/gnome/pixmaps/gnome-monitor.png
 share/gnome/pixmaps/gnome-month.png
 share/gnome/pixmaps/gnome-mouse.png
-share/gnome/pixmaps/gnome-multimedia.png
 share/gnome/pixmaps/gnome-networktool.png
 share/gnome/pixmaps/gnome-news.png
 share/gnome/pixmaps/gnome-note.png
 share/gnome/pixmaps/gnome-qeye.png
 share/gnome/pixmaps/gnome-session.png
 share/gnome/pixmaps/gnome-set-time.png
-share/gnome/pixmaps/gnome-settings.png
 share/gnome/pixmaps/gnome-spider.png
 share/gnome/pixmaps/gnome-squeak.png
 share/gnome/pixmaps/gnome-suse.png
-share/gnome/pixmaps/gnome-system.png
 share/gnome/pixmaps/gnome-talk.png
 share/gnome/pixmaps/gnome-term-linux.png
 share/gnome/pixmaps/gnome-term-linux2.png
@@ -94,7 +94,6 @@ share/gnome/pixmaps/gnome-term-tiger.png
 share/gnome/pixmaps/gnome-term.png
 share/gnome/pixmaps/gnome-tigert.png
 share/gnome/pixmaps/gnome-touristinfo.png
-share/gnome/pixmaps/gnome-unknown.png
 share/gnome/pixmaps/gnome-user-interface.png
 share/gnome/pixmaps/gnome-util.png
 share/gnome/pixmaps/gnome-week.png
@@ -150,6 +149,7 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -185,6 +185,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
 @dirrm share/gnome/help/fdl/C/figures
+@dirrm share/gnome/gnome-about/headers
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0