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

2 files changed, 159 insertions, 159 deletions

diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile
index 7f7cc249df76..0f941b4c48e1 100644
--- a/games/gnomermind/Makefile
+++ b/games/gnomermind/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomermind
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gnomermind/pkg-plist b/games/gnomermind/pkg-plist
index 2e96711fd4e3..2a6c01ab64c6 100644
--- a/games/gnomermind/pkg-plist
+++ b/games/gnomermind/pkg-plist
@@ -6,150 +6,150 @@ bin/gnomermind
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/apps/Games/gnomermind.desktop
-share/gnome/gnomermind/themes/Classic/ABOUT
-share/gnome/gnomermind/themes/Classic/b.png
-share/gnome/gnomermind/themes/Classic/bl.png
-share/gnome/gnomermind/themes/Classic/br.png
-share/gnome/gnomermind/themes/Classic/l.png
-share/gnome/gnomermind/themes/Classic/mpin0.png
-share/gnome/gnomermind/themes/Classic/mpin1.png
-share/gnome/gnomermind/themes/Classic/mpin2.png
-share/gnome/gnomermind/themes/Classic/mpin3.png
-share/gnome/gnomermind/themes/Classic/mpin4.png
-share/gnome/gnomermind/themes/Classic/mpin5.png
-share/gnome/gnomermind/themes/Classic/mstt.png
-share/gnome/gnomermind/themes/Classic/mtok.png
-share/gnome/gnomermind/themes/Classic/pin0.png
-share/gnome/gnomermind/themes/Classic/pin1.png
-share/gnome/gnomermind/themes/Classic/pin2.png
-share/gnome/gnomermind/themes/Classic/r.png
-share/gnome/gnomermind/themes/Classic/stt0.png
-share/gnome/gnomermind/themes/Classic/stt1.png
-share/gnome/gnomermind/themes/Classic/stt2.png
-share/gnome/gnomermind/themes/Classic/stt3.png
-share/gnome/gnomermind/themes/Classic/tile.png
-share/gnome/gnomermind/themes/Classic/tok0.png
-share/gnome/gnomermind/themes/Classic/tok1.png
-share/gnome/gnomermind/themes/Classic/tok2.png
-share/gnome/gnomermind/themes/Classic/tok3.png
-share/gnome/gnomermind/themes/Classic/tok4.png
-share/gnome/gnomermind/themes/Classic/tok5.png
-share/gnome/gnomermind/themes/Classic/tok6.png
-share/gnome/gnomermind/themes/Classic/tok7.png
-share/gnome/gnomermind/themes/Classic/tok8.png
-share/gnome/gnomermind/themes/Classic/tok9.png
-share/gnome/gnomermind/themes/Classic/tokh.png
-share/gnome/gnomermind/themes/Classic/u.png
-share/gnome/gnomermind/themes/Classic/ul.png
-share/gnome/gnomermind/themes/Classic/ur.png
-share/gnome/gnomermind/themes/Pingus/ABOUT
-share/gnome/gnomermind/themes/Pingus/b.png
-share/gnome/gnomermind/themes/Pingus/bl.png
-share/gnome/gnomermind/themes/Pingus/br.png
-share/gnome/gnomermind/themes/Pingus/l.png
-share/gnome/gnomermind/themes/Pingus/mpin0.png
-share/gnome/gnomermind/themes/Pingus/mpin1.png
-share/gnome/gnomermind/themes/Pingus/mpin2.png
-share/gnome/gnomermind/themes/Pingus/mpin3.png
-share/gnome/gnomermind/themes/Pingus/mpin4.png
-share/gnome/gnomermind/themes/Pingus/mpin5.png
-share/gnome/gnomermind/themes/Pingus/mstt.png
-share/gnome/gnomermind/themes/Pingus/mtok.png
-share/gnome/gnomermind/themes/Pingus/pin0.png
-share/gnome/gnomermind/themes/Pingus/pin1.png
-share/gnome/gnomermind/themes/Pingus/pin2.png
-share/gnome/gnomermind/themes/Pingus/r.png
-share/gnome/gnomermind/themes/Pingus/stt0.png
-share/gnome/gnomermind/themes/Pingus/stt1.png
-share/gnome/gnomermind/themes/Pingus/stt2.png
-share/gnome/gnomermind/themes/Pingus/stt3.png
-share/gnome/gnomermind/themes/Pingus/tile.png
-share/gnome/gnomermind/themes/Pingus/tok0.png
-share/gnome/gnomermind/themes/Pingus/tok1.png
-share/gnome/gnomermind/themes/Pingus/tok2.png
-share/gnome/gnomermind/themes/Pingus/tok3.png
-share/gnome/gnomermind/themes/Pingus/tok4.png
-share/gnome/gnomermind/themes/Pingus/tok5.png
-share/gnome/gnomermind/themes/Pingus/tok6.png
-share/gnome/gnomermind/themes/Pingus/tok7.png
-share/gnome/gnomermind/themes/Pingus/tok8.png
-share/gnome/gnomermind/themes/Pingus/tok9.png
-share/gnome/gnomermind/themes/Pingus/tokh.png
-share/gnome/gnomermind/themes/Pingus/u.png
-share/gnome/gnomermind/themes/Pingus/ul.png
-share/gnome/gnomermind/themes/Pingus/ur.png
-share/gnome/gnomermind/themes/QMM/ABOUT
-share/gnome/gnomermind/themes/QMM/b.png
-share/gnome/gnomermind/themes/QMM/bl.png
-share/gnome/gnomermind/themes/QMM/br.png
-share/gnome/gnomermind/themes/QMM/l.png
-share/gnome/gnomermind/themes/QMM/mpin0.png
-share/gnome/gnomermind/themes/QMM/mpin1.png
-share/gnome/gnomermind/themes/QMM/mpin2.png
-share/gnome/gnomermind/themes/QMM/mpin3.png
-share/gnome/gnomermind/themes/QMM/mpin4.png
-share/gnome/gnomermind/themes/QMM/mpin5.png
-share/gnome/gnomermind/themes/QMM/mstt.png
-share/gnome/gnomermind/themes/QMM/mtok.png
-share/gnome/gnomermind/themes/QMM/pin0.png
-share/gnome/gnomermind/themes/QMM/pin1.png
-share/gnome/gnomermind/themes/QMM/pin2.png
-share/gnome/gnomermind/themes/QMM/r.png
-share/gnome/gnomermind/themes/QMM/stt0.png
-share/gnome/gnomermind/themes/QMM/stt1.png
-share/gnome/gnomermind/themes/QMM/stt2.png
-share/gnome/gnomermind/themes/QMM/stt3.png
-share/gnome/gnomermind/themes/QMM/tile.png
-share/gnome/gnomermind/themes/QMM/tok0.png
-share/gnome/gnomermind/themes/QMM/tok1.png
-share/gnome/gnomermind/themes/QMM/tok2.png
-share/gnome/gnomermind/themes/QMM/tok3.png
-share/gnome/gnomermind/themes/QMM/tok4.png
-share/gnome/gnomermind/themes/QMM/tok5.png
-share/gnome/gnomermind/themes/QMM/tok6.png
-share/gnome/gnomermind/themes/QMM/tok7.png
-share/gnome/gnomermind/themes/QMM/tok8.png
-share/gnome/gnomermind/themes/QMM/tok9.png
-share/gnome/gnomermind/themes/QMM/tokh.png
-share/gnome/gnomermind/themes/QMM/u.png
-share/gnome/gnomermind/themes/QMM/ul.png
-share/gnome/gnomermind/themes/QMM/ur.png
-share/gnome/gnomermind/themes/Scribble/ABOUT
-share/gnome/gnomermind/themes/Scribble/b.png
-share/gnome/gnomermind/themes/Scribble/bl.png
-share/gnome/gnomermind/themes/Scribble/br.png
-share/gnome/gnomermind/themes/Scribble/l.png
-share/gnome/gnomermind/themes/Scribble/mpin0.png
-share/gnome/gnomermind/themes/Scribble/mpin1.png
-share/gnome/gnomermind/themes/Scribble/mpin2.png
-share/gnome/gnomermind/themes/Scribble/mpin3.png
-share/gnome/gnomermind/themes/Scribble/mpin4.png
-share/gnome/gnomermind/themes/Scribble/mpin5.png
-share/gnome/gnomermind/themes/Scribble/mstt.png
-share/gnome/gnomermind/themes/Scribble/mtok.png
-share/gnome/gnomermind/themes/Scribble/pin0.png
-share/gnome/gnomermind/themes/Scribble/pin1.png
-share/gnome/gnomermind/themes/Scribble/pin2.png
-share/gnome/gnomermind/themes/Scribble/r.png
-share/gnome/gnomermind/themes/Scribble/stt0.png
-share/gnome/gnomermind/themes/Scribble/stt1.png
-share/gnome/gnomermind/themes/Scribble/stt2.png
-share/gnome/gnomermind/themes/Scribble/stt3.png
-share/gnome/gnomermind/themes/Scribble/tile.png
-share/gnome/gnomermind/themes/Scribble/tok0.png
-share/gnome/gnomermind/themes/Scribble/tok1.png
-share/gnome/gnomermind/themes/Scribble/tok2.png
-share/gnome/gnomermind/themes/Scribble/tok3.png
-share/gnome/gnomermind/themes/Scribble/tok4.png
-share/gnome/gnomermind/themes/Scribble/tok5.png
-share/gnome/gnomermind/themes/Scribble/tok6.png
-share/gnome/gnomermind/themes/Scribble/tok7.png
-share/gnome/gnomermind/themes/Scribble/tok8.png
-share/gnome/gnomermind/themes/Scribble/tok9.png
-share/gnome/gnomermind/themes/Scribble/tokh.png
-share/gnome/gnomermind/themes/Scribble/u.png
-share/gnome/gnomermind/themes/Scribble/ul.png
-share/gnome/gnomermind/themes/Scribble/ur.png
+%%DATADIR%%/themes/Classic/ABOUT
+%%DATADIR%%/themes/Classic/b.png
+%%DATADIR%%/themes/Classic/bl.png
+%%DATADIR%%/themes/Classic/br.png
+%%DATADIR%%/themes/Classic/l.png
+%%DATADIR%%/themes/Classic/mpin0.png
+%%DATADIR%%/themes/Classic/mpin1.png
+%%DATADIR%%/themes/Classic/mpin2.png
+%%DATADIR%%/themes/Classic/mpin3.png
+%%DATADIR%%/themes/Classic/mpin4.png
+%%DATADIR%%/themes/Classic/mpin5.png
+%%DATADIR%%/themes/Classic/mstt.png
+%%DATADIR%%/themes/Classic/mtok.png
+%%DATADIR%%/themes/Classic/pin0.png
+%%DATADIR%%/themes/Classic/pin1.png
+%%DATADIR%%/themes/Classic/pin2.png
+%%DATADIR%%/themes/Classic/r.png
+%%DATADIR%%/themes/Classic/stt0.png
+%%DATADIR%%/themes/Classic/stt1.png
+%%DATADIR%%/themes/Classic/stt2.png
+%%DATADIR%%/themes/Classic/stt3.png
+%%DATADIR%%/themes/Classic/tile.png
+%%DATADIR%%/themes/Classic/tok0.png
+%%DATADIR%%/themes/Classic/tok1.png
+%%DATADIR%%/themes/Classic/tok2.png
+%%DATADIR%%/themes/Classic/tok3.png
+%%DATADIR%%/themes/Classic/tok4.png
+%%DATADIR%%/themes/Classic/tok5.png
+%%DATADIR%%/themes/Classic/tok6.png
+%%DATADIR%%/themes/Classic/tok7.png
+%%DATADIR%%/themes/Classic/tok8.png
+%%DATADIR%%/themes/Classic/tok9.png
+%%DATADIR%%/themes/Classic/tokh.png
+%%DATADIR%%/themes/Classic/u.png
+%%DATADIR%%/themes/Classic/ul.png
+%%DATADIR%%/themes/Classic/ur.png
+%%DATADIR%%/themes/Pingus/ABOUT
+%%DATADIR%%/themes/Pingus/b.png
+%%DATADIR%%/themes/Pingus/bl.png
+%%DATADIR%%/themes/Pingus/br.png
+%%DATADIR%%/themes/Pingus/l.png
+%%DATADIR%%/themes/Pingus/mpin0.png
+%%DATADIR%%/themes/Pingus/mpin1.png
+%%DATADIR%%/themes/Pingus/mpin2.png
+%%DATADIR%%/themes/Pingus/mpin3.png
+%%DATADIR%%/themes/Pingus/mpin4.png
+%%DATADIR%%/themes/Pingus/mpin5.png
+%%DATADIR%%/themes/Pingus/mstt.png
+%%DATADIR%%/themes/Pingus/mtok.png
+%%DATADIR%%/themes/Pingus/pin0.png
+%%DATADIR%%/themes/Pingus/pin1.png
+%%DATADIR%%/themes/Pingus/pin2.png
+%%DATADIR%%/themes/Pingus/r.png
+%%DATADIR%%/themes/Pingus/stt0.png
+%%DATADIR%%/themes/Pingus/stt1.png
+%%DATADIR%%/themes/Pingus/stt2.png
+%%DATADIR%%/themes/Pingus/stt3.png
+%%DATADIR%%/themes/Pingus/tile.png
+%%DATADIR%%/themes/Pingus/tok0.png
+%%DATADIR%%/themes/Pingus/tok1.png
+%%DATADIR%%/themes/Pingus/tok2.png
+%%DATADIR%%/themes/Pingus/tok3.png
+%%DATADIR%%/themes/Pingus/tok4.png
+%%DATADIR%%/themes/Pingus/tok5.png
+%%DATADIR%%/themes/Pingus/tok6.png
+%%DATADIR%%/themes/Pingus/tok7.png
+%%DATADIR%%/themes/Pingus/tok8.png
+%%DATADIR%%/themes/Pingus/tok9.png
+%%DATADIR%%/themes/Pingus/tokh.png
+%%DATADIR%%/themes/Pingus/u.png
+%%DATADIR%%/themes/Pingus/ul.png
+%%DATADIR%%/themes/Pingus/ur.png
+%%DATADIR%%/themes/QMM/ABOUT
+%%DATADIR%%/themes/QMM/b.png
+%%DATADIR%%/themes/QMM/bl.png
+%%DATADIR%%/themes/QMM/br.png
+%%DATADIR%%/themes/QMM/l.png
+%%DATADIR%%/themes/QMM/mpin0.png
+%%DATADIR%%/themes/QMM/mpin1.png
+%%DATADIR%%/themes/QMM/mpin2.png
+%%DATADIR%%/themes/QMM/mpin3.png
+%%DATADIR%%/themes/QMM/mpin4.png
+%%DATADIR%%/themes/QMM/mpin5.png
+%%DATADIR%%/themes/QMM/mstt.png
+%%DATADIR%%/themes/QMM/mtok.png
+%%DATADIR%%/themes/QMM/pin0.png
+%%DATADIR%%/themes/QMM/pin1.png
+%%DATADIR%%/themes/QMM/pin2.png
+%%DATADIR%%/themes/QMM/r.png
+%%DATADIR%%/themes/QMM/stt0.png
+%%DATADIR%%/themes/QMM/stt1.png
+%%DATADIR%%/themes/QMM/stt2.png
+%%DATADIR%%/themes/QMM/stt3.png
+%%DATADIR%%/themes/QMM/tile.png
+%%DATADIR%%/themes/QMM/tok0.png
+%%DATADIR%%/themes/QMM/tok1.png
+%%DATADIR%%/themes/QMM/tok2.png
+%%DATADIR%%/themes/QMM/tok3.png
+%%DATADIR%%/themes/QMM/tok4.png
+%%DATADIR%%/themes/QMM/tok5.png
+%%DATADIR%%/themes/QMM/tok6.png
+%%DATADIR%%/themes/QMM/tok7.png
+%%DATADIR%%/themes/QMM/tok8.png
+%%DATADIR%%/themes/QMM/tok9.png
+%%DATADIR%%/themes/QMM/tokh.png
+%%DATADIR%%/themes/QMM/u.png
+%%DATADIR%%/themes/QMM/ul.png
+%%DATADIR%%/themes/QMM/ur.png
+%%DATADIR%%/themes/Scribble/ABOUT
+%%DATADIR%%/themes/Scribble/b.png
+%%DATADIR%%/themes/Scribble/bl.png
+%%DATADIR%%/themes/Scribble/br.png
+%%DATADIR%%/themes/Scribble/l.png
+%%DATADIR%%/themes/Scribble/mpin0.png
+%%DATADIR%%/themes/Scribble/mpin1.png
+%%DATADIR%%/themes/Scribble/mpin2.png
+%%DATADIR%%/themes/Scribble/mpin3.png
+%%DATADIR%%/themes/Scribble/mpin4.png
+%%DATADIR%%/themes/Scribble/mpin5.png
+%%DATADIR%%/themes/Scribble/mstt.png
+%%DATADIR%%/themes/Scribble/mtok.png
+%%DATADIR%%/themes/Scribble/pin0.png
+%%DATADIR%%/themes/Scribble/pin1.png
+%%DATADIR%%/themes/Scribble/pin2.png
+%%DATADIR%%/themes/Scribble/r.png
+%%DATADIR%%/themes/Scribble/stt0.png
+%%DATADIR%%/themes/Scribble/stt1.png
+%%DATADIR%%/themes/Scribble/stt2.png
+%%DATADIR%%/themes/Scribble/stt3.png
+%%DATADIR%%/themes/Scribble/tile.png
+%%DATADIR%%/themes/Scribble/tok0.png
+%%DATADIR%%/themes/Scribble/tok1.png
+%%DATADIR%%/themes/Scribble/tok2.png
+%%DATADIR%%/themes/Scribble/tok3.png
+%%DATADIR%%/themes/Scribble/tok4.png
+%%DATADIR%%/themes/Scribble/tok5.png
+%%DATADIR%%/themes/Scribble/tok6.png
+%%DATADIR%%/themes/Scribble/tok7.png
+%%DATADIR%%/themes/Scribble/tok8.png
+%%DATADIR%%/themes/Scribble/tok9.png
+%%DATADIR%%/themes/Scribble/tokh.png
+%%DATADIR%%/themes/Scribble/u.png
+%%DATADIR%%/themes/Scribble/ul.png
+%%DATADIR%%/themes/Scribble/ur.png
 share/gnome/help/gnomermind/C/authors.html
 share/gnome/help/gnomermind/C/bugs.html
 share/gnome/help/gnomermind/C/docbook.css
@@ -173,13 +173,13 @@ share/gnome/help/gnomermind/C/topic.dat
 share/gnome/help/gnomermind/C/usage.html
 share/gnome/help/gnomermind/C/x167.html
 share/gnome/help/gnomermind/C/x394.html
-share/gnome/pixmaps/gnomermind.png
-share/gnome/sounds/gnomermind/gm-fail.wav
-share/gnome/sounds/gnomermind/gm-guess.wav
-share/gnome/sounds/gnomermind/gm-pickup.wav
-share/gnome/sounds/gnomermind/gm-putdown.wav
-share/gnome/sounds/gnomermind/gm-reset.wav
-share/gnome/sounds/gnomermind/gm-success.wav
+share/pixmaps/gnomermind.png
+share/sounds/gnomermind/gm-fail.wav
+share/sounds/gnomermind/gm-guess.wav
+share/sounds/gnomermind/gm-pickup.wav
+share/sounds/gnomermind/gm-putdown.wav
+share/sounds/gnomermind/gm-reset.wav
+share/sounds/gnomermind/gm-success.wav
 share/locale/de/LC_MESSAGES/gnomermind.mo
 share/locale/es/LC_MESSAGES/gnomermind.mo
 share/locale/fr/LC_MESSAGES/gnomermind.mo
@@ -192,14 +192,14 @@ share/locale/sk/LC_MESSAGES/gnomermind.mo
 share/locale/sv/LC_MESSAGES/gnomermind.mo
 share/locale/tr/LC_MESSAGES/gnomermind.mo
 share/locale/zh_TW/LC_MESSAGES/gnomermind.mo
-@dirrm share/gnome/sounds/gnomermind
+@dirrm share/sounds/gnomermind
 @dirrm share/gnome/help/gnomermind/C/stylesheet-images
 @dirrm share/gnome/help/gnomermind/C
 @dirrm share/gnome/help/gnomermind
-@dirrm share/gnome/gnomermind/themes/Scribble
-@dirrm share/gnome/gnomermind/themes/QMM
-@dirrm share/gnome/gnomermind/themes/Pingus
-@dirrm share/gnome/gnomermind/themes/Classic
-@dirrm share/gnome/gnomermind/themes
-@dirrm share/gnome/gnomermind
+@dirrm %%DATADIR%%/themes/Scribble
+@dirrm %%DATADIR%%/themes/QMM
+@dirrm %%DATADIR%%/themes/Pingus
+@dirrm %%DATADIR%%/themes/Classic
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%