Back to betas...Update to GNOME 2.0 beta 5.

4 files changed, 41 insertions, 26 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 4ebe5e385ab1..c87cb41d9d65 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	1.116.0
+PORTVERSION=	1.117.0
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index f22c9f4a8108..8c24d34981b4 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-1.116.0.tar.bz2) = 64cd727e6cbfd7fc6f01c8a7f323ac32
+MD5 (gnome2/libgnome-1.117.0.tar.bz2) = 154158d266dbc2f18b76157191e3750e
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
new file mode 100644
index 000000000000..4c3c6b33cea4
--- /dev/null
+++ b/x11/libgnome/files/patch-libgnome_gnome-program.c
@@ -0,0 +1,33 @@
+--- libgnome/gnome-program.c.orig	Fri May 17 20:18:53 2002
++++ libgnome/gnome-program.c	Fri May 17 20:19:50 2002
+@@ -882,12 +882,12 @@
+ 	attr_rel = "";
+ 	break;
+     case GNOME_FILE_DOMAIN_SOUND:
+-	prefix_rel = "/share/sounds";
++	prefix_rel = "/share/gnome/sounds";
+ 	attr_name = GNOME_PARAM_GNOME_DATADIR;
+ 	attr_rel = "/sounds";
+ 	break;
+     case GNOME_FILE_DOMAIN_PIXMAP:
+-	prefix_rel = "/share/pixmaps";
++	prefix_rel = "/share/gnome/pixmaps";
+ 	attr_name = GNOME_PARAM_GNOME_DATADIR;
+ 	attr_rel = "/pixmaps";
+ 	break;
+@@ -914,13 +914,13 @@
+ 	search_path = FALSE;
+ 	break;
+     case GNOME_FILE_DOMAIN_APP_SOUND:
+-	prefix_rel = "/share/sounds";
++	prefix_rel = "/share/gnome/sounds";
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 	attr_rel = "/sounds";
+ 	search_path = FALSE;
+ 	break;
+     case GNOME_FILE_DOMAIN_APP_PIXMAP:
+-	prefix_rel = "/share/pixmaps";
++	prefix_rel = "/share/gnome/pixmaps";
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 	attr_rel = "/pixmaps";
+ 	search_path = FALSE;
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 9ce4366dfcaf..d91a7e6ea3d4 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -12,7 +12,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/file-views/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/file_views/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/interface/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
@@ -87,27 +87,6 @@ lib/libgnome-2.so
 lib/libgnome-2.so.0
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
-share/doc/libgnome/index.html
-share/doc/libgnome/index.sgml
-share/doc/libgnome/libgnome-gnome-config.html
-share/doc/libgnome/libgnome-gnome-exec.html
-share/doc/libgnome/libgnome-gnome-gconf.html
-share/doc/libgnome/libgnome-gnome-help.html
-share/doc/libgnome/libgnome-gnome-i18n.html
-share/doc/libgnome/libgnome-gnome-init.html
-share/doc/libgnome/libgnome-gnome-program.html
-share/doc/libgnome/libgnome-gnome-score.html
-share/doc/libgnome/libgnome-gnome-sound.html
-share/doc/libgnome/libgnome-gnome-triggers.html
-share/doc/libgnome/libgnome-gnome-url.html
-share/doc/libgnome/libgnome-gnome-util.html
-share/doc/libgnome/libgnome-libgnometypebuiltins.html
-share/doc/libgnome/libgnome.html
-share/doc/libgnome/x1277.html
-share/doc/libgnome/x2848.html
-share/doc/libgnome/x3213.html
-share/doc/libgnome/x4055.html
-share/doc/libgnome/x9.html
 share/gnome/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
 share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
 share/gnome/sgml/docbook/gnome-customization-0.1/l10n.xml
@@ -115,6 +94,7 @@ share/locale/az/LC_MESSAGES/libgnome-2.0.mo
 share/locale/da/LC_MESSAGES/libgnome-2.0.mo
 share/locale/de/LC_MESSAGES/libgnome-2.0.mo
 share/locale/es/LC_MESSAGES/libgnome-2.0.mo
+share/locale/eu/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnome-2.0.mo
 share/locale/it/LC_MESSAGES/libgnome-2.0.mo
@@ -126,6 +106,7 @@ share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
 share/locale/no/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnome-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnome-2.0.mo
@@ -133,6 +114,7 @@ share/locale/sv/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnome-2.0.mo
 share/locale/tr/LC_MESSAGES/libgnome-2.0.mo
 share/locale/uk/LC_MESSAGES/libgnome-2.0.mo
+share/locale/vi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/wa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@@ -178,7 +160,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/interface
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/file-views
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/file_views
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/background
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal