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

11 files changed, 4 insertions, 54 deletions

diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa
index 1af3d26ce2ef..8ec33082e174 100644
--- a/x11/gnome-libs/files/patch-aa
+++ b/x11/gnome-libs/files/patch-aa
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- configure.orig	Mon Apr 29 12:07:59 2002
 +++ configure	Mon Apr 29 12:08:54 2002
 @@ -5339,6 +5339,7 @@
diff --git a/x11/gnome-libs/files/patch-ad b/x11/gnome-libs/files/patch-ad
deleted file mode 100644
index 32e656859e37..000000000000
--- a/x11/gnome-libs/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnome/gnome-help.c.orig	Thu Apr  8 15:01:21 1999
-+++ libgnome/gnome-help.c	Mon Jul 12 10:29:11 1999
-@@ -69,7 +69,7 @@
- 		lang= language_list->data;
- 		
- 		buf= g_string_new (NULL);
--		g_string_sprintf (buf, "gnome/help/%s/%s/%s", app, lang, path);
-+		g_string_sprintf (buf, "help/%s/%s/%s", app, lang, path);
- 		res= (gchar *)gnome_unconditional_datadir_file (buf->str);
- 		p = strrchr (res, '#');
- 		if (p) {
-@@ -118,7 +118,7 @@
- 	if (!res)
- 	{
- 		buf = g_string_new(NULL);
--		g_string_sprintf(buf, "gnome/help/%s/C/%s", app, path);
-+		g_string_sprintf(buf, "help/%s/C/%s", app, path);
- 		res = (gchar *)gnome_unconditional_datadir_file(buf->str);
- 		g_string_free(buf, TRUE);
- 	}
diff --git a/x11/gnome-libs/files/patch-bb b/x11/gnome-libs/files/patch-bb
index a1daaf14fc52..d6564a00e8c5 100644
--- a/x11/gnome-libs/files/patch-bb
+++ b/x11/gnome-libs/files/patch-bb
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- gtk-xmhtml/Makefile.in.orig	Mon Jan 14 12:02:33 2002
 +++ gtk-xmhtml/Makefile.in	Mon Jan 14 12:03:13 2002
 @@ -151,7 +151,7 @@
diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg
index 401724e01ed0..87aecf289d82 100644
--- a/x11/gnome-libs/files/patch-bg
+++ b/x11/gnome-libs/files/patch-bg
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- zvt/Makefile.in.orig	Sat Apr  6 19:22:07 2002
 +++ zvt/Makefile.in	Sat Apr  6 19:23:02 2002
 @@ -20,7 +20,7 @@
diff --git a/x11/gnome-libs/files/patch-bi b/x11/gnome-libs/files/patch-bi
index dd39ef04d88e..3b2325030f35 100644
--- a/x11/gnome-libs/files/patch-bi
+++ b/x11/gnome-libs/files/patch-bi
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- libart_lgpl/Makefile.in.orig	Sun Jun 23 11:41:23 2002
 +++ libart_lgpl/Makefile.in	Sun Jun 23 11:42:23 2002
 @@ -145,7 +145,7 @@
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
index b98c5295317b..17709b79f18f 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/gnome/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/gnome/Makefile.in	2002/05/01 01:50:40
 @@ -158,7 +158,7 @@
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnome
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
index 9266154be01a..de8b5960f7c1 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/gnomeui/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/gnomeui/Makefile.in	2002/05/01 01:50:55
 @@ -161,7 +161,7 @@
  CFLAGS = `gnome-config --cflags gnomeui`
  LDFLAGS = `gnome-config --libs gnomeui`
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
index e7cc10f89a6b..e5a6981cdb86 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/gnorba/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/gnorba/Makefile.in	2002/05/01 01:51:15
 @@ -158,7 +158,7 @@
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnorba
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
index c03007ea3a2d..60b6affec183 100644
--- a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/zvt/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/zvt/Makefile.in	2002/05/01 01:51:06
 @@ -158,7 +158,7 @@
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/zvt
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-libart_lgpl::configure b/x11/gnome-libs/files/patch-libart_lgpl::configure
index 2ee4ceb2e6b1..2f4ef6723578 100644
--- a/x11/gnome-libs/files/patch-libart_lgpl::configure
+++ b/x11/gnome-libs/files/patch-libart_lgpl::configure
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- libart_lgpl/configure	2002/04/29 09:45:17	1.1
 +++ libart_lgpl/configure	2002/04/29 09:45:37
 @@ -5090,6 +5090,7 @@
diff --git a/x11/gnome-libs/files/patch-po::Makefile.in.in b/x11/gnome-libs/files/patch-po::Makefile.in.in
index 68b6a8c98491..8cd933b46112 100644
--- a/x11/gnome-libs/files/patch-po::Makefile.in.in
+++ b/x11/gnome-libs/files/patch-po::Makefile.in.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- po/Makefile.in.in	2002/01/14 11:02:35	1.1
 +++ po/Makefile.in.in	2002/01/14 11:02:49
 @@ -106,7 +106,7 @@