Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

5 files changed, 68 insertions, 40 deletions

diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 2e5ce8983bbf..c06e101516de 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -22,7 +23,6 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libbonoboui
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 7a9f1dd050e2..51f00e14c13d 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-2.2.2.tar.bz2) = 2d58cd438aabffc00e65ecd4bab63349
+MD5 (gnome2/libgnomeui-2.4.0.1.tar.bz2) = 196f4a3f1f4a531ff57acaa879e98dd2
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
index c8ff2dcd7d66..69f8b2e7c4d5 100644
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
@@ -1,6 +1,6 @@
---- libgnomeui/Makefile.in.orig	Wed Jun  4 10:23:03 2003
-+++ libgnomeui/Makefile.in	Wed Jun  4 10:23:38 2003
-@@ -144,7 +144,7 @@
+--- libgnomeui/Makefile.in.orig	Fri Jun 13 14:41:05 2003
++++ libgnomeui/Makefile.in	Fri Jun 13 14:41:43 2003
+@@ -148,7 +148,7 @@
  #
  libgnomeuiincludedir = $(includedir)/libgnomeui-2.0/libgnomeui
  
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c
new file mode 100644
index 000000000000..ecb6739ab17b
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c
@@ -0,0 +1,24 @@
+--- libgnomeui/gnome-icon-lookup.c.orig	Thu Sep 18 02:13:50 2003
++++ libgnomeui/gnome-icon-lookup.c	Thu Sep 18 02:16:19 2003
+@@ -107,6 +107,10 @@
+ 
+   if (vfs_mime_name)
+     {
++      /* Handle absolute files */
++      if (vfs_mime_name[0] == '/')
++        return g_strdup (vfs_mime_name);
++
+       p = strrchr(vfs_mime_name, '.');
+ 
+       if (p)
+@@ -293,7 +297,9 @@
+   if (mime_type)
+     {
+       mime_name = get_vfs_mime_name (mime_type);
+-      if (mime_name && gnome_icon_theme_has_icon (icon_theme, mime_name))
++      if (mime_name &&
++	 ((mime_name[0] == '/' && g_file_test (mime_name, G_FILE_TEST_IS_REGULAR) ||
++	   gnome_icon_theme_has_icon (icon_theme, mime_name))))
+ 	return mime_name;
+       g_free (mime_name);
+       
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index fe141862799b..e7113b5466a7 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -4,6 +4,7 @@ include/libgnomeui-2.0/libgnomeui/gnome-app-helper.h
 include/libgnomeui-2.0/libgnomeui/gnome-app-util.h
 include/libgnomeui-2.0/libgnomeui/gnome-app.h
 include/libgnomeui-2.0/libgnomeui/gnome-appbar.h
+include/libgnomeui-2.0/libgnomeui/gnome-authentication-manager.h
 include/libgnomeui-2.0/libgnomeui/gnome-client.h
 include/libgnomeui-2.0/libgnomeui/gnome-color-picker.h
 include/libgnomeui-2.0/libgnomeui/gnome-dateedit.h
@@ -29,6 +30,7 @@ include/libgnomeui-2.0/libgnomeui/gnome-mdi-generic-child.h
 include/libgnomeui-2.0/libgnomeui/gnome-mdi-session.h
 include/libgnomeui-2.0/libgnomeui/gnome-mdi.h
 include/libgnomeui-2.0/libgnomeui/gnome-messagebox.h
+include/libgnomeui-2.0/libgnomeui/gnome-password-dialog.h
 include/libgnomeui-2.0/libgnomeui/gnome-pixmap-entry.h
 include/libgnomeui-2.0/libgnomeui/gnome-pixmap.h
 include/libgnomeui-2.0/libgnomeui/gnome-popup-menu.h
@@ -48,43 +50,46 @@ include/libgnomeui-2.0/libgnomeui/libgnomeui.h
 lib/libglade/2.0/libgnome.so
 lib/libgnomeui-2.a
 lib/libgnomeui-2.so
-lib/libgnomeui-2.so.200
+lib/libgnomeui-2.so.400
 libdata/pkgconfig/libgnomeui-2.0.pc
 libexec/gnome_segv2
+share/doc/libgnomeui/GnomeAbout.html
+share/doc/libgnomeui/GnomeApp.html
+share/doc/libgnomeui/GnomeAppBar.html
+share/doc/libgnomeui/GnomeClient.html
+share/doc/libgnomeui/GnomeColorPicker.html
+share/doc/libgnomeui/GnomeDateEdit.html
+share/doc/libgnomeui/GnomeDialog.html
+share/doc/libgnomeui/GnomeDruid.html
+share/doc/libgnomeui/GnomeDruidPage.html
+share/doc/libgnomeui/GnomeDruidPageEdge.html
+share/doc/libgnomeui/GnomeDruidPageStandard.html
+share/doc/libgnomeui/GnomeEntry.html
+share/doc/libgnomeui/GnomeFileEntry.html
+share/doc/libgnomeui/GnomeFontPicker.html
+share/doc/libgnomeui/GnomeHRef.html
+share/doc/libgnomeui/GnomeIconEntry.html
+share/doc/libgnomeui/GnomeIconList.html
+share/doc/libgnomeui/GnomeIconSelection.html
+share/doc/libgnomeui/GnomeMDI.html
+share/doc/libgnomeui/GnomeMDIChild.html
+share/doc/libgnomeui/GnomeMDIGenericChild.html
+share/doc/libgnomeui/GnomeMessageBox.html
+share/doc/libgnomeui/GnomePixmap.html
+share/doc/libgnomeui/GnomePixmapEntry.html
+share/doc/libgnomeui/GnomePropertyBox.html
+share/doc/libgnomeui/GnomeScores.html
 share/doc/libgnomeui/application-mgmt.html
-share/doc/libgnomeui/c4.html
+share/doc/libgnomeui/ch01.html
 share/doc/libgnomeui/deprecated.html
 share/doc/libgnomeui/druids.html
 share/doc/libgnomeui/fixme.html
-share/doc/libgnomeui/gnomeabout.html
-share/doc/libgnomeui/gnomeapp.html
-share/doc/libgnomeui/gnomeappbar.html
-share/doc/libgnomeui/gnomeclient.html
-share/doc/libgnomeui/gnomecolorpicker.html
-share/doc/libgnomeui/gnomedateedit.html
-share/doc/libgnomeui/gnomedialog.html
-share/doc/libgnomeui/gnomedruid.html
-share/doc/libgnomeui/gnomedruidpage.html
-share/doc/libgnomeui/gnomedruidpageedge.html
-share/doc/libgnomeui/gnomedruidpagestandard.html
-share/doc/libgnomeui/gnomeentry.html
-share/doc/libgnomeui/gnomefileentry.html
-share/doc/libgnomeui/gnomefontpicker.html
-share/doc/libgnomeui/gnomehref.html
-share/doc/libgnomeui/gnomeiconentry.html
-share/doc/libgnomeui/gnomeiconlist.html
-share/doc/libgnomeui/gnomeiconselection.html
-share/doc/libgnomeui/gnomeicontextitem.html
-share/doc/libgnomeui/gnomemdi.html
-share/doc/libgnomeui/gnomemdichild.html
-share/doc/libgnomeui/gnomemdigenericchild.html
-share/doc/libgnomeui/gnomemessagebox.html
-share/doc/libgnomeui/gnomepixmap.html
-share/doc/libgnomeui/gnomepixmapentry.html
-share/doc/libgnomeui/gnomepropertybox.html
-share/doc/libgnomeui/gnomescores.html
 share/doc/libgnomeui/index.html
 share/doc/libgnomeui/index.sgml
+share/doc/libgnomeui/libgnomeui-GnomeIconLookup.html
+share/doc/libgnomeui/libgnomeui-GnomeIconTheme.html
+share/doc/libgnomeui/libgnomeui-GnomeThemeFile.html
+share/doc/libgnomeui/libgnomeui-GnomeThumbnail.html
 share/doc/libgnomeui/libgnomeui-gnome-app-helper.html
 share/doc/libgnomeui/libgnomeui-gnome-app-util.html
 share/doc/libgnomeui/libgnomeui-gnome-dialog-util.html
@@ -96,10 +101,6 @@ share/doc/libgnomeui/libgnomeui-gnome-ui-init.html
 share/doc/libgnomeui/libgnomeui-gnome-uidefs.html
 share/doc/libgnomeui/libgnomeui-gnome-vfs-util.html
 share/doc/libgnomeui/libgnomeui-gnome-window.html
-share/doc/libgnomeui/libgnomeui-gnomeiconlookup.html
-share/doc/libgnomeui/libgnomeui-gnomeicontheme.html
-share/doc/libgnomeui/libgnomeui-gnomethemefile.html
-share/doc/libgnomeui/libgnomeui-gnomethumbnail.html
 share/doc/libgnomeui/libgnomeui-gnometypebuiltins.html
 share/doc/libgnomeui/libgnomeui-objects.html
 share/doc/libgnomeui/miscellaneous.html
@@ -114,6 +115,7 @@ share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/be/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/bn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo
@@ -137,6 +139,7 @@ share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/kn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ko/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/li/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/lt/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo
@@ -153,6 +156,7 @@ share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sr/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo