Update to 2.5.1.

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

4 files changed, 5 insertions, 44 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index f3377d347..89ab63d75 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.5.0
+PORTVERSION=	2.5.1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -22,7 +22,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier esound gnomevfs2 libxslt
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack esound gnomevfs2 \
+		libxslt
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index fb429a78b..3d91647a2 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-2.5.0.tar.bz2) = 8895b41928bfb19b8ba2b89fda8fabb2
+MD5 (gnome2/libgnome-2.5.1.tar.bz2) = 1b58479fdb26c52fdbc1a3d633a8a752
diff --git a/x11/libgnome/files/patch-intltool-merge.in b/x11/libgnome/files/patch-intltool-merge.in
deleted file mode 100644
index 54c8a2331..000000000
--- a/x11/libgnome/files/patch-intltool-merge.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- intltool-merge.in.orig	Wed Nov 12 15:29:28 2003
-+++ intltool-merge.in	Wed Nov 12 15:31:54 2003
-@@ -858,7 +858,7 @@
-     if ($MULTIPLE_OUTPUT) {
-         for my $lang (sort keys %po_files_by_lang) {
- 	    if ( ! -e $lang ) {
--	        mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
-+	        mkdir $lang, 0777 or die "Cannot create subdirectory $lang: $!\n";
-             }
-             open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
-             my $tree = readXml($FILE);
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index acd26c62f..c4c23d322 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -16,13 +16,6 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml
@@ -41,13 +34,6 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
 etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
 etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas
 etc/gconf/schemas/desktop_gnome_applications_browser.schemas
@@ -62,7 +48,6 @@ etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
 etc/gconf/schemas/desktop_gnome_sound.schemas
 etc/gconf/schemas/desktop_gnome_thumbnailers.schemas
 etc/gconf/schemas/desktop_gnome_typing_break.schemas
-etc/gconf/schemas/desktop_gnome_url_handlers.schemas
 etc/sound/events/gnome-2.soundlist
 etc/sound/events/gtk-events-2.soundlist
 include/libgnome-2.0/libgnome/gnome-config.h
@@ -83,7 +68,7 @@ include/libgnome-2.0/libgnome/libgnometypebuiltins.h
 lib/bonobo/monikers/libmoniker_extra_2.so
 lib/libgnome-2.a
 lib/libgnome-2.so
-lib/libgnome-2.so.500
+lib/libgnome-2.so.501
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
 share/doc/libgnome/ch01s02.html
@@ -173,13 +158,6 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm share/doc/libgnome
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
@@ -197,13 +175,6 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/startup
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound