Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

4 files changed, 16 insertions, 36 deletions

diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 99f09ed3db93..3bf8762aa97b 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.99 2007/03/14 03:42:53 marcus Exp $
+#    $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.108 2007/10/17 22:37:05 mezz Exp $
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.18.1
-PORTREVISION?=	2
+PORTVERSION=	2.20.1.1
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 5930958b8652..36eb70bcf572 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.18.1.tar.bz2) = dbdb274517ad643d9397dd6868788631
-SHA256 (gnome2/libgnomeui-2.18.1.tar.bz2) = d6eef491e70fcc2c1e5b94f6a8dbb3774443b3b76b1ca5d62bfb5b802df14120
-SIZE (gnome2/libgnomeui-2.18.1.tar.bz2) = 1462027
+MD5 (gnome2/libgnomeui-2.20.1.1.tar.bz2) = d1f500c5d33ce93159b4952bb476fcf3
+SHA256 (gnome2/libgnomeui-2.20.1.1.tar.bz2) = 133933c70234ecd4560cec165034c21c94598c24c34138ed1ee1770f52328cef
+SIZE (gnome2/libgnomeui-2.20.1.1.tar.bz2) = 1445994
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c
deleted file mode 100644
index c3c751eff668..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- libgnomeui/gnome-thumbnail.c.orig	Sat Jan 21 23:11:21 2006
-+++ libgnomeui/gnome-thumbnail.c	Sat Jan 21 23:10:52 2006
-@@ -994,11 +994,7 @@ gnome_thumbnail_factory_generate_thumbna
-     return NULL;
- 
-   width = gdk_pixbuf_get_width (pixbuf);
--  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
--			  g_strdup_printf ("%d", width), g_free);
-   height = gdk_pixbuf_get_height (pixbuf);
--  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
--			  g_strdup_printf ("%d", height), g_free);
- 
-   if (width > size || height > size)
-     {
-@@ -1011,6 +1007,13 @@ gnome_thumbnail_factory_generate_thumbna
-       g_object_unref (pixbuf);
-       pixbuf = scaled;
-     }
-+
-+  width = gdk_pixbuf_get_width (pixbuf);
-+  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
-+			  g_strdup_printf ("%d", width), g_free);
-+  height = gdk_pixbuf_get_height (pixbuf);
-+  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
-+			  g_strdup_printf ("%d", height), g_free);
-   
-   return pixbuf;
- }
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index ebd78c97d835..acce03934cfd 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -60,8 +60,6 @@ lib/libgnomeui-2.la
 lib/libgnomeui-2.so
 lib/libgnomeui-2.so.0
 libdata/pkgconfig/libgnomeui-2.0.pc
-libexec/gnome_segv2
-share/gnome/pixmaps/gnome-about-logo.png
 share/locale/af/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo
@@ -96,6 +94,7 @@ share/locale/he/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hr/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/hy/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/id/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
@@ -119,6 +118,7 @@ share/locale/ne/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/nso/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/oc/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/or/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pa/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo
@@ -127,6 +127,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/rw/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/si/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
@@ -149,6 +150,7 @@ share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
+share/pixmaps/gnome-about-logo.png
 @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/filesystems
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
@@ -166,8 +168,12 @@ share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -178,6 +184,8 @@ share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES