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, 62 insertions, 62 deletions

diff --git a/games/childsplay/Makefile b/games/childsplay/Makefile
index 67476ff281a2..cb746b2b3aa8 100644
--- a/games/childsplay/Makefile
+++ b/games/childsplay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	childsplay
 PORTVERSION=	0.80.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	childsplay
diff --git a/games/childsplay/files/patch-INSTALL.sh b/games/childsplay/files/patch-INSTALL.sh
index bd7257572de2..53330f1d1e66 100644
--- a/games/childsplay/files/patch-INSTALL.sh
+++ b/games/childsplay/files/patch-INSTALL.sh
@@ -13,7 +13,7 @@
  EXECDIR=$PREFIX/bin
  LOCALEDIR=$PREFIX/share/locale
 -ASSETMLDIR=/usr/share/assetml
-+ASSETMLDIR=$PREFIX/share/gnome/assetml
++ASSETMLDIR=$PREFIX/share/assetml
  SCOREDIR=/var/games
  SCOREFILE=$SCOREDIR/childsplay.score
  DOCDIR=$PREFIX/share/doc/childsplay
diff --git a/games/childsplay/pkg-plist b/games/childsplay/pkg-plist
index a9bebfe0400e..a1e1ba07f314 100644
--- a/games/childsplay/pkg-plist
+++ b/games/childsplay/pkg-plist
@@ -66,59 +66,59 @@ share/locale/es/LC_MESSAGES/childsplay.mo
 share/locale/fr/LC_MESSAGES/childsplay.mo
 share/locale/it/LC_MESSAGES/childsplay.mo
 share/locale/nl/LC_MESSAGES/childsplay.mo
-share/gnome/assetml/childsplay/childsplay-images/po/Translation.raw
-share/gnome/assetml/childsplay/childsplay-images/bluebold.ttf
-share/gnome/assetml/childsplay/childsplay-images/OK_but.png
-share/gnome/assetml/childsplay/childsplay-images/question1.png
-share/gnome/assetml/childsplay/childsplay-images/bullpen3.ttf
-share/gnome/assetml/childsplay/childsplay-images/firework1.png
-share/gnome/assetml/childsplay/childsplay-images/firework2.png
-share/gnome/assetml/childsplay/childsplay-images/chpl-icon-48-flat.png
-share/gnome/assetml/childsplay/childsplay-images/cowsplash.png
-share/gnome/assetml/childsplay/childsplay-images/blue.jpg
-share/gnome/assetml/childsplay/childsplay-images/tux.png
-share/gnome/assetml/childsplay/childsplay-images/pointer.png
-share/gnome/assetml/childsplay/childsplay-images/arrow.png
-share/gnome/assetml/childsplay/childsplay-images/bluehigh.ttf
-share/gnome/assetml/childsplay/childsplay-images/cowsplash-load.png
-share/gnome/assetml/childsplay/childsplay-images/childsplay-images.assetml
-share/gnome/assetml/childsplay/childsplay-images/land.png
-share/gnome/assetml/childsplay/childsplay-images/MORE_but.png
-share/gnome/assetml/childsplay/childsplay-images/balloonsl.png
-share/gnome/assetml/childsplay/childsplay-images/balloonsr.png
-share/gnome/assetml/childsplay/childsplay-images/stop.png
-share/gnome/assetml/childsplay/childsplay-images/hscore.png
-share/gnome/assetml/childsplay/childsplay-images/chpl-icon-48.png
-share/gnome/assetml/childsplay/childsplay-images/chpl-icon-48.xpm
-share/gnome/assetml/childsplay/memory-136x136/po/es.po
-share/gnome/assetml/childsplay/memory-136x136/po/fr.po
-share/gnome/assetml/childsplay/memory-136x136/po/nl.po
-share/gnome/assetml/childsplay/memory-136x136/po/memory-136x136.pot
-share/gnome/assetml/childsplay/memory-136x136/tree.png
-share/gnome/assetml/childsplay/memory-136x136/plane.png
-share/gnome/assetml/childsplay/memory-136x136/apple.png
-share/gnome/assetml/childsplay/memory-136x136/bread.png
-share/gnome/assetml/childsplay/memory-136x136/dog.png
-share/gnome/assetml/childsplay/memory-136x136/bear.png
-share/gnome/assetml/childsplay/memory-136x136/fish.png
-share/gnome/assetml/childsplay/memory-136x136/monkey.png
-share/gnome/assetml/childsplay/memory-136x136/boat.png
-share/gnome/assetml/childsplay/memory-136x136/memory-136x136.assetml
-share/gnome/assetml/childsplay/memory-136x136/car.png
-share/gnome/assetml/childsplay/memory-136x136/grapes.png
-share/gnome/assetml/childsplay/memory-136x136/lion.png
-share/gnome/assetml/childsplay/childsplay-sounds/po/nl.po
-share/gnome/assetml/childsplay/childsplay-sounds/po/Translation.raw
-share/gnome/assetml/childsplay/childsplay-sounds/bummer.wav
-share/gnome/assetml/childsplay/childsplay-sounds/childsplay-sounds.assetml
-share/gnome/assetml/childsplay/childsplay-sounds/level_clear.wav
-share/gnome/assetml/childsplay/childsplay-sounds/rocket.wav
-share/gnome/assetml/childsplay/childsplay-sounds/wahoo.wav
-share/gnome/assetml/childsplay/childsplay-sounds/cows.ogg
-share/gnome/assetml/childsplay/childsplay-sounds/Winner2.ogg
-share/gnome/assetml/childsplay/childsplay-sounds/music1.ogg
-share/gnome/assetml/childsplay/childsplay-sounds/dealcard1.wav
-share/gnome/assetml/childsplay/childsplay-sounds/boom.wav
+share/assetml/childsplay/childsplay-images/po/Translation.raw
+share/assetml/childsplay/childsplay-images/bluebold.ttf
+share/assetml/childsplay/childsplay-images/OK_but.png
+share/assetml/childsplay/childsplay-images/question1.png
+share/assetml/childsplay/childsplay-images/bullpen3.ttf
+share/assetml/childsplay/childsplay-images/firework1.png
+share/assetml/childsplay/childsplay-images/firework2.png
+share/assetml/childsplay/childsplay-images/chpl-icon-48-flat.png
+share/assetml/childsplay/childsplay-images/cowsplash.png
+share/assetml/childsplay/childsplay-images/blue.jpg
+share/assetml/childsplay/childsplay-images/tux.png
+share/assetml/childsplay/childsplay-images/pointer.png
+share/assetml/childsplay/childsplay-images/arrow.png
+share/assetml/childsplay/childsplay-images/bluehigh.ttf
+share/assetml/childsplay/childsplay-images/cowsplash-load.png
+share/assetml/childsplay/childsplay-images/childsplay-images.assetml
+share/assetml/childsplay/childsplay-images/land.png
+share/assetml/childsplay/childsplay-images/MORE_but.png
+share/assetml/childsplay/childsplay-images/balloonsl.png
+share/assetml/childsplay/childsplay-images/balloonsr.png
+share/assetml/childsplay/childsplay-images/stop.png
+share/assetml/childsplay/childsplay-images/hscore.png
+share/assetml/childsplay/childsplay-images/chpl-icon-48.png
+share/assetml/childsplay/childsplay-images/chpl-icon-48.xpm
+share/assetml/childsplay/memory-136x136/po/es.po
+share/assetml/childsplay/memory-136x136/po/fr.po
+share/assetml/childsplay/memory-136x136/po/nl.po
+share/assetml/childsplay/memory-136x136/po/memory-136x136.pot
+share/assetml/childsplay/memory-136x136/tree.png
+share/assetml/childsplay/memory-136x136/plane.png
+share/assetml/childsplay/memory-136x136/apple.png
+share/assetml/childsplay/memory-136x136/bread.png
+share/assetml/childsplay/memory-136x136/dog.png
+share/assetml/childsplay/memory-136x136/bear.png
+share/assetml/childsplay/memory-136x136/fish.png
+share/assetml/childsplay/memory-136x136/monkey.png
+share/assetml/childsplay/memory-136x136/boat.png
+share/assetml/childsplay/memory-136x136/memory-136x136.assetml
+share/assetml/childsplay/memory-136x136/car.png
+share/assetml/childsplay/memory-136x136/grapes.png
+share/assetml/childsplay/memory-136x136/lion.png
+share/assetml/childsplay/childsplay-sounds/po/nl.po
+share/assetml/childsplay/childsplay-sounds/po/Translation.raw
+share/assetml/childsplay/childsplay-sounds/bummer.wav
+share/assetml/childsplay/childsplay-sounds/childsplay-sounds.assetml
+share/assetml/childsplay/childsplay-sounds/level_clear.wav
+share/assetml/childsplay/childsplay-sounds/rocket.wav
+share/assetml/childsplay/childsplay-sounds/wahoo.wav
+share/assetml/childsplay/childsplay-sounds/cows.ogg
+share/assetml/childsplay/childsplay-sounds/Winner2.ogg
+share/assetml/childsplay/childsplay-sounds/music1.ogg
+share/assetml/childsplay/childsplay-sounds/dealcard1.wav
+share/assetml/childsplay/childsplay-sounds/boom.wav
 share/childsplay/Data/bluebold.ttf
 share/childsplay/Data/bluehigh.ttf
 share/childsplay/Data/boom.wav
@@ -152,13 +152,13 @@ share/childsplay/lib/MemoryData/cardback.png
 @dirrm share/doc/childsplay/po/it
 @dirrm share/doc/childsplay/po
 @dirrm share/doc/childsplay
-@dirrm share/gnome/assetml/childsplay/childsplay-images/po
-@dirrm share/gnome/assetml/childsplay/childsplay-images
-@dirrm share/gnome/assetml/childsplay/memory-136x136/po
-@dirrm share/gnome/assetml/childsplay/memory-136x136
-@dirrm share/gnome/assetml/childsplay/childsplay-sounds/po
-@dirrm share/gnome/assetml/childsplay/childsplay-sounds
-@dirrm share/gnome/assetml/childsplay
+@dirrm share/assetml/childsplay/childsplay-images/po
+@dirrm share/assetml/childsplay/childsplay-images
+@dirrm share/assetml/childsplay/memory-136x136/po
+@dirrm share/assetml/childsplay/memory-136x136
+@dirrm share/assetml/childsplay/childsplay-sounds/po
+@dirrm share/assetml/childsplay/childsplay-sounds
+@dirrm share/assetml/childsplay
 @dirrm share/childsplay/Data/icons
 @dirrm share/childsplay/Data
 @dirrm share/childsplay/lib/ConfigData