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

3 files changed, 46 insertions, 72 deletions

diff --git a/x11-fm/velocity/Makefile b/x11-fm/velocity/Makefile
index 46ff339a8bd0..bab45304a560 100644
--- a/x11-fm/velocity/Makefile
+++ b/x11-fm/velocity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	velocity
 PORTVERSION=	0.1.0b
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.jarrodkoehler.com/velocity/
 DISTNAME=	velocity-0.1.0beta
diff --git a/x11-fm/velocity/files/patch-configure b/x11-fm/velocity/files/patch-configure
deleted file mode 100644
index b90722cd34ba..000000000000
--- a/x11-fm/velocity/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	Tue Aug 26 03:15:17 2003
-+++ configure	Wed Dec 10 20:50:34 2003
-@@ -7156,16 +7156,16 @@
-   packageprefix=${prefix}
- fi
- 
--packagedatadir=share/${PACKAGE}
--packagedocdir=doc/${PACKAGE}
-+packagedatadir=share/gnome/${PACKAGE}
-+packagedocdir=share/doc/${PACKAGE}
- 
--packagepixmapsdir=share/pixmaps/${PACKAGE}
-+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
- packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
--packagescriptsdir=share/${PACKAGE}/scripts
--packagetemplatesdir=share/${PACKAGE}/templates
--packagepluginsdir=share/${PACKAGE}/plugins
--packagesendtodir=share/${PACKAGE}/sendto
-+packagemenudir=share/gnome/applications
-+packagescriptsdir=share/gnome/${PACKAGE}/scripts
-+packagetemplatesdir=share/gnome/${PACKAGE}/templates
-+packagepluginsdir=share/gnome/${PACKAGE}/plugins
-+packagesendtodir=share/gnome/${PACKAGE}/sendto
- 
- NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
- 
diff --git a/x11-fm/velocity/pkg-plist b/x11-fm/velocity/pkg-plist
index 1b5e70d0d9c5..39b9e8b8fdfd 100644
--- a/x11-fm/velocity/pkg-plist
+++ b/x11-fm/velocity/pkg-plist
@@ -1,45 +1,46 @@
 bin/velocity
-share/gnome/applications/velocity.desktop
-share/gnome/pixmaps/velocity/advanced.png
-share/gnome/pixmaps/velocity/behavior.png
-share/gnome/pixmaps/velocity/bin.png
-share/gnome/pixmaps/velocity/desktop.png
-share/gnome/pixmaps/velocity/druid-left.png
-share/gnome/pixmaps/velocity/druid-top.png
-share/gnome/pixmaps/velocity/puzzle-piece.png
-share/gnome/pixmaps/velocity/puzzle.png
-share/gnome/pixmaps/velocity/themes.png
-share/gnome/pixmaps/velocity/velocity.png
-share/gnome/velocity/plugins/audio.so
-share/gnome/velocity/plugins/burn.so
-share/gnome/velocity/scripts/audio-to-mp3
-share/gnome/velocity/scripts/audio-to-ogg
-share/gnome/velocity/scripts/create-tarball
-share/gnome/velocity/scripts/line-word-count
-share/gnome/velocity/scripts/pdf-to-postscript
-share/gnome/velocity/scripts/postscript-to-pdf
-share/gnome/velocity/scripts/terminal-here
-share/gnome/velocity/scripts/uncompress
-share/gnome/velocity/templates/abiword-document
-share/gnome/velocity/templates/data/abiword-document
-share/gnome/velocity/templates/data/dia-document
-share/gnome/velocity/templates/data/gimp-image
-share/gnome/velocity/templates/data/gnumeric-document
-share/gnome/velocity/templates/data/html-document
-share/gnome/velocity/templates/data/shell-script
-share/gnome/velocity/templates/data/velocity-script
-share/gnome/velocity/templates/data/word-document
-share/gnome/velocity/templates/dia-document
-share/gnome/velocity/templates/gimp-image
-share/gnome/velocity/templates/gnumeric-document
-share/gnome/velocity/templates/html-document
-share/gnome/velocity/templates/plain-text
-share/gnome/velocity/templates/shell-script
-share/gnome/velocity/templates/velocity-script
-share/gnome/velocity/templates/word-document
-@dirrm share/gnome/velocity/templates/data
-@dirrm share/gnome/velocity/templates
-@dirrm share/gnome/velocity/scripts
-@dirrm share/gnome/velocity/plugins
-@dirrm share/gnome/velocity
-@dirrm share/gnome/pixmaps/velocity
+share/applications/velocity.desktop
+share/pixmaps/velocity/advanced.png
+share/pixmaps/velocity/behavior.png
+share/pixmaps/velocity/bin.png
+share/pixmaps/velocity/desktop.png
+share/pixmaps/velocity/druid-left.png
+share/pixmaps/velocity/druid-top.png
+share/pixmaps/velocity/puzzle-piece.png
+share/pixmaps/velocity/puzzle.png
+share/pixmaps/velocity/themes.png
+share/pixmaps/velocity/velocity.png
+share/velocity/plugins/audio.so
+share/velocity/plugins/burn.so
+share/velocity/scripts/audio-to-mp3
+share/velocity/scripts/audio-to-ogg
+share/velocity/scripts/create-tarball
+share/velocity/scripts/line-word-count
+share/velocity/scripts/pdf-to-postscript
+share/velocity/scripts/postscript-to-pdf
+share/velocity/scripts/terminal-here
+share/velocity/scripts/uncompress
+share/velocity/templates/abiword-document
+share/velocity/templates/data/abiword-document
+share/velocity/templates/data/dia-document
+share/velocity/templates/data/gimp-image
+share/velocity/templates/data/gnumeric-document
+share/velocity/templates/data/html-document
+share/velocity/templates/data/shell-script
+share/velocity/templates/data/velocity-script
+share/velocity/templates/data/word-document
+share/velocity/templates/dia-document
+share/velocity/templates/gimp-image
+share/velocity/templates/gnumeric-document
+share/velocity/templates/html-document
+share/velocity/templates/plain-text
+share/velocity/templates/shell-script
+share/velocity/templates/velocity-script
+share/velocity/templates/word-document
+@dirrm share/velocity/templates/data
+@dirrm share/velocity/templates
+@dirrm share/velocity/scripts
+@dirrm share/velocity/plugins
+@dirrm share/velocity
+@dirrm share/pixmaps/velocity
+@dirrmtry share/applications