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, 157 insertions, 155 deletions

diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 429cbafc1cd0..9399ca422cfc 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	monkeybubble
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	http://home.gna.org/monkeybubble/downloads/
 DISTNAME=	monkey-bubble-${PORTVERSION}
diff --git a/games/monkeybubble/pkg-plist b/games/monkeybubble/pkg-plist
index 9846b965f0e5..9b24c1cac61b 100644
--- a/games/monkeybubble/pkg-plist
+++ b/games/monkeybubble/pkg-plist
@@ -1,153 +1,153 @@
 bin/monkey-bubble
 bin/monkey-srv
-share/gnome/applications/monkey-bubble.desktop
+share/applications/monkey-bubble.desktop
 share/gnome/help/monkey-bubble/C/monkey-bubble.xml
 share/gnome/help/monkey-bubble/fr/monkey-bubble.xml
-share/gnome/monkey-bubble/gfx/banana.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_01.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_02.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_03.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_04.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_05.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_06.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_07.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_08.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_01.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_02.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_03.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_04.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_05.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_06.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_07.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_08.svg
-share/gnome/monkey-bubble/gfx/frozen-bubble/back_hiscores.png
-share/gnome/monkey-bubble/gfx/harm.svg
-share/gnome/monkey-bubble/gfx/harm_down.svg
-share/gnome/monkey-bubble/gfx/harm_shoot.svg
-share/gnome/monkey-bubble/gfx/harm_up.svg
-share/gnome/monkey-bubble/gfx/hurry_up.svg
-share/gnome/monkey-bubble/gfx/layout_1_player.svg
-share/gnome/monkey-bubble/gfx/layout_2_players.svg
-share/gnome/monkey-bubble/gfx/layout_network_player.svg
-share/gnome/monkey-bubble/gfx/left_monkey.svg
-share/gnome/monkey-bubble/gfx/looser.svg
-share/gnome/monkey-bubble/gfx/lost.svg
-share/gnome/monkey-bubble/gfx/monkey.png
-share/gnome/monkey-bubble/gfx/number/0.svg
-share/gnome/monkey-bubble/gfx/number/1.svg
-share/gnome/monkey-bubble/gfx/number/2.svg
-share/gnome/monkey-bubble/gfx/number/3.svg
-share/gnome/monkey-bubble/gfx/number/4.svg
-share/gnome/monkey-bubble/gfx/number/5.svg
-share/gnome/monkey-bubble/gfx/number/6.svg
-share/gnome/monkey-bubble/gfx/number/7.svg
-share/gnome/monkey-bubble/gfx/number/8.svg
-share/gnome/monkey-bubble/gfx/number/9.svg
-share/gnome/monkey-bubble/gfx/pane.svg
-share/gnome/monkey-bubble/gfx/pause.svg
-share/gnome/monkey-bubble/gfx/right_monkey.svg
-share/gnome/monkey-bubble/gfx/snake/snake.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-0.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-1.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-10.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-11.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-12.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-13.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-14.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-15.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-16.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-17.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-18.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-19.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-2.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-20.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-21.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-22.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-23.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-24.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-25.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-26.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-27.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-28.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-29.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-3.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-30.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-31.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-32.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-33.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-34.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-35.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-36.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-37.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-38.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-39.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-4.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-40.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-5.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-6.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-7.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-8.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-9.svg
-share/gnome/monkey-bubble/gfx/snake/snake_0.svg
-share/gnome/monkey-bubble/gfx/snake/snake_1.svg
-share/gnome/monkey-bubble/gfx/snake/snake_10.svg
-share/gnome/monkey-bubble/gfx/snake/snake_11.svg
-share/gnome/monkey-bubble/gfx/snake/snake_12.svg
-share/gnome/monkey-bubble/gfx/snake/snake_13.svg
-share/gnome/monkey-bubble/gfx/snake/snake_14.svg
-share/gnome/monkey-bubble/gfx/snake/snake_15.svg
-share/gnome/monkey-bubble/gfx/snake/snake_16.svg
-share/gnome/monkey-bubble/gfx/snake/snake_17.svg
-share/gnome/monkey-bubble/gfx/snake/snake_18.svg
-share/gnome/monkey-bubble/gfx/snake/snake_19.svg
-share/gnome/monkey-bubble/gfx/snake/snake_2.svg
-share/gnome/monkey-bubble/gfx/snake/snake_20.svg
-share/gnome/monkey-bubble/gfx/snake/snake_21.svg
-share/gnome/monkey-bubble/gfx/snake/snake_22.svg
-share/gnome/monkey-bubble/gfx/snake/snake_23.svg
-share/gnome/monkey-bubble/gfx/snake/snake_24.svg
-share/gnome/monkey-bubble/gfx/snake/snake_25.svg
-share/gnome/monkey-bubble/gfx/snake/snake_26.svg
-share/gnome/monkey-bubble/gfx/snake/snake_27.svg
-share/gnome/monkey-bubble/gfx/snake/snake_28.svg
-share/gnome/monkey-bubble/gfx/snake/snake_29.svg
-share/gnome/monkey-bubble/gfx/snake/snake_3.svg
-share/gnome/monkey-bubble/gfx/snake/snake_30.svg
-share/gnome/monkey-bubble/gfx/snake/snake_31.svg
-share/gnome/monkey-bubble/gfx/snake/snake_32.svg
-share/gnome/monkey-bubble/gfx/snake/snake_33.svg
-share/gnome/monkey-bubble/gfx/snake/snake_34.svg
-share/gnome/monkey-bubble/gfx/snake/snake_35.svg
-share/gnome/monkey-bubble/gfx/snake/snake_36.svg
-share/gnome/monkey-bubble/gfx/snake/snake_37.svg
-share/gnome/monkey-bubble/gfx/snake/snake_38.svg
-share/gnome/monkey-bubble/gfx/snake/snake_39.svg
-share/gnome/monkey-bubble/gfx/snake/snake_4.svg
-share/gnome/monkey-bubble/gfx/snake/snake_40.svg
-share/gnome/monkey-bubble/gfx/snake/snake_5.svg
-share/gnome/monkey-bubble/gfx/snake/snake_6.svg
-share/gnome/monkey-bubble/gfx/snake/snake_7.svg
-share/gnome/monkey-bubble/gfx/snake/snake_8.svg
-share/gnome/monkey-bubble/gfx/snake/snake_9.svg
-share/gnome/monkey-bubble/gfx/snake-body.svg
-share/gnome/monkey-bubble/gfx/splash.svg
-share/gnome/monkey-bubble/gfx/star.svg
-share/gnome/monkey-bubble/gfx/tomato.svg
-share/gnome/monkey-bubble/gfx/win.svg
-share/gnome/monkey-bubble/glade/keybinding.glade
-share/gnome/monkey-bubble/glade/monkey-bubble.glade
-share/gnome/monkey-bubble/glade/netgame.glade
-share/gnome/monkey-bubble/glade/netserver.glade
-share/gnome/monkey-bubble/levels
-share/gnome/monkey-bubble/sounds/destroy_group.wav
-share/gnome/monkey-bubble/sounds/game.ogg
-share/gnome/monkey-bubble/sounds/launch.wav
-share/gnome/monkey-bubble/sounds/rebound.wav
-share/gnome/monkey-bubble/sounds/splash.ogg
-share/gnome/monkey-bubble/sounds/stick.wav
-share/gnome/omf/monkey-bubble/monkey-bubble-C.omf
-share/gnome/omf/monkey-bubble/monkey-bubble-fr.omf
-share/gnome/pixmaps/monkey-bubble-icon.png
+share/monkey-bubble/gfx/banana.svg
+share/monkey-bubble/gfx/bubbles/bubble_01.svg
+share/monkey-bubble/gfx/bubbles/bubble_02.svg
+share/monkey-bubble/gfx/bubbles/bubble_03.svg
+share/monkey-bubble/gfx/bubbles/bubble_04.svg
+share/monkey-bubble/gfx/bubbles/bubble_05.svg
+share/monkey-bubble/gfx/bubbles/bubble_06.svg
+share/monkey-bubble/gfx/bubbles/bubble_07.svg
+share/monkey-bubble/gfx/bubbles/bubble_08.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_01.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_02.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_03.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_04.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_05.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_06.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_07.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_08.svg
+share/monkey-bubble/gfx/frozen-bubble/back_hiscores.png
+share/monkey-bubble/gfx/harm.svg
+share/monkey-bubble/gfx/harm_down.svg
+share/monkey-bubble/gfx/harm_shoot.svg
+share/monkey-bubble/gfx/harm_up.svg
+share/monkey-bubble/gfx/hurry_up.svg
+share/monkey-bubble/gfx/layout_1_player.svg
+share/monkey-bubble/gfx/layout_2_players.svg
+share/monkey-bubble/gfx/layout_network_player.svg
+share/monkey-bubble/gfx/left_monkey.svg
+share/monkey-bubble/gfx/looser.svg
+share/monkey-bubble/gfx/lost.svg
+share/monkey-bubble/gfx/monkey.png
+share/monkey-bubble/gfx/number/0.svg
+share/monkey-bubble/gfx/number/1.svg
+share/monkey-bubble/gfx/number/2.svg
+share/monkey-bubble/gfx/number/3.svg
+share/monkey-bubble/gfx/number/4.svg
+share/monkey-bubble/gfx/number/5.svg
+share/monkey-bubble/gfx/number/6.svg
+share/monkey-bubble/gfx/number/7.svg
+share/monkey-bubble/gfx/number/8.svg
+share/monkey-bubble/gfx/number/9.svg
+share/monkey-bubble/gfx/pane.svg
+share/monkey-bubble/gfx/pause.svg
+share/monkey-bubble/gfx/right_monkey.svg
+share/monkey-bubble/gfx/snake/snake.svg
+share/monkey-bubble/gfx/snake/snake_-0.svg
+share/monkey-bubble/gfx/snake/snake_-1.svg
+share/monkey-bubble/gfx/snake/snake_-10.svg
+share/monkey-bubble/gfx/snake/snake_-11.svg
+share/monkey-bubble/gfx/snake/snake_-12.svg
+share/monkey-bubble/gfx/snake/snake_-13.svg
+share/monkey-bubble/gfx/snake/snake_-14.svg
+share/monkey-bubble/gfx/snake/snake_-15.svg
+share/monkey-bubble/gfx/snake/snake_-16.svg
+share/monkey-bubble/gfx/snake/snake_-17.svg
+share/monkey-bubble/gfx/snake/snake_-18.svg
+share/monkey-bubble/gfx/snake/snake_-19.svg
+share/monkey-bubble/gfx/snake/snake_-2.svg
+share/monkey-bubble/gfx/snake/snake_-20.svg
+share/monkey-bubble/gfx/snake/snake_-21.svg
+share/monkey-bubble/gfx/snake/snake_-22.svg
+share/monkey-bubble/gfx/snake/snake_-23.svg
+share/monkey-bubble/gfx/snake/snake_-24.svg
+share/monkey-bubble/gfx/snake/snake_-25.svg
+share/monkey-bubble/gfx/snake/snake_-26.svg
+share/monkey-bubble/gfx/snake/snake_-27.svg
+share/monkey-bubble/gfx/snake/snake_-28.svg
+share/monkey-bubble/gfx/snake/snake_-29.svg
+share/monkey-bubble/gfx/snake/snake_-3.svg
+share/monkey-bubble/gfx/snake/snake_-30.svg
+share/monkey-bubble/gfx/snake/snake_-31.svg
+share/monkey-bubble/gfx/snake/snake_-32.svg
+share/monkey-bubble/gfx/snake/snake_-33.svg
+share/monkey-bubble/gfx/snake/snake_-34.svg
+share/monkey-bubble/gfx/snake/snake_-35.svg
+share/monkey-bubble/gfx/snake/snake_-36.svg
+share/monkey-bubble/gfx/snake/snake_-37.svg
+share/monkey-bubble/gfx/snake/snake_-38.svg
+share/monkey-bubble/gfx/snake/snake_-39.svg
+share/monkey-bubble/gfx/snake/snake_-4.svg
+share/monkey-bubble/gfx/snake/snake_-40.svg
+share/monkey-bubble/gfx/snake/snake_-5.svg
+share/monkey-bubble/gfx/snake/snake_-6.svg
+share/monkey-bubble/gfx/snake/snake_-7.svg
+share/monkey-bubble/gfx/snake/snake_-8.svg
+share/monkey-bubble/gfx/snake/snake_-9.svg
+share/monkey-bubble/gfx/snake/snake_0.svg
+share/monkey-bubble/gfx/snake/snake_1.svg
+share/monkey-bubble/gfx/snake/snake_10.svg
+share/monkey-bubble/gfx/snake/snake_11.svg
+share/monkey-bubble/gfx/snake/snake_12.svg
+share/monkey-bubble/gfx/snake/snake_13.svg
+share/monkey-bubble/gfx/snake/snake_14.svg
+share/monkey-bubble/gfx/snake/snake_15.svg
+share/monkey-bubble/gfx/snake/snake_16.svg
+share/monkey-bubble/gfx/snake/snake_17.svg
+share/monkey-bubble/gfx/snake/snake_18.svg
+share/monkey-bubble/gfx/snake/snake_19.svg
+share/monkey-bubble/gfx/snake/snake_2.svg
+share/monkey-bubble/gfx/snake/snake_20.svg
+share/monkey-bubble/gfx/snake/snake_21.svg
+share/monkey-bubble/gfx/snake/snake_22.svg
+share/monkey-bubble/gfx/snake/snake_23.svg
+share/monkey-bubble/gfx/snake/snake_24.svg
+share/monkey-bubble/gfx/snake/snake_25.svg
+share/monkey-bubble/gfx/snake/snake_26.svg
+share/monkey-bubble/gfx/snake/snake_27.svg
+share/monkey-bubble/gfx/snake/snake_28.svg
+share/monkey-bubble/gfx/snake/snake_29.svg
+share/monkey-bubble/gfx/snake/snake_3.svg
+share/monkey-bubble/gfx/snake/snake_30.svg
+share/monkey-bubble/gfx/snake/snake_31.svg
+share/monkey-bubble/gfx/snake/snake_32.svg
+share/monkey-bubble/gfx/snake/snake_33.svg
+share/monkey-bubble/gfx/snake/snake_34.svg
+share/monkey-bubble/gfx/snake/snake_35.svg
+share/monkey-bubble/gfx/snake/snake_36.svg
+share/monkey-bubble/gfx/snake/snake_37.svg
+share/monkey-bubble/gfx/snake/snake_38.svg
+share/monkey-bubble/gfx/snake/snake_39.svg
+share/monkey-bubble/gfx/snake/snake_4.svg
+share/monkey-bubble/gfx/snake/snake_40.svg
+share/monkey-bubble/gfx/snake/snake_5.svg
+share/monkey-bubble/gfx/snake/snake_6.svg
+share/monkey-bubble/gfx/snake/snake_7.svg
+share/monkey-bubble/gfx/snake/snake_8.svg
+share/monkey-bubble/gfx/snake/snake_9.svg
+share/monkey-bubble/gfx/snake-body.svg
+share/monkey-bubble/gfx/splash.svg
+share/monkey-bubble/gfx/star.svg
+share/monkey-bubble/gfx/tomato.svg
+share/monkey-bubble/gfx/win.svg
+share/monkey-bubble/glade/keybinding.glade
+share/monkey-bubble/glade/monkey-bubble.glade
+share/monkey-bubble/glade/netgame.glade
+share/monkey-bubble/glade/netserver.glade
+share/monkey-bubble/levels
+share/monkey-bubble/sounds/destroy_group.wav
+share/monkey-bubble/sounds/game.ogg
+share/monkey-bubble/sounds/launch.wav
+share/monkey-bubble/sounds/rebound.wav
+share/monkey-bubble/sounds/splash.ogg
+share/monkey-bubble/sounds/stick.wav
+share/omf/monkey-bubble/monkey-bubble-C.omf
+share/omf/monkey-bubble/monkey-bubble-fr.omf
+share/pixmaps/monkey-bubble-icon.png
 share/locale/bg/LC_MESSAGES/monkey-bubble.mo
 share/locale/cs/LC_MESSAGES/monkey-bubble.mo
 share/locale/de/LC_MESSAGES/monkey-bubble.mo
@@ -176,15 +176,16 @@ share/locale/uk/LC_MESSAGES/monkey-bubble.mo
 share/locale/vi/LC_MESSAGES/monkey-bubble.mo
 share/locale/zh_CN/LC_MESSAGES/monkey-bubble.mo
 share/locale/zh_TW/LC_MESSAGES/monkey-bubble.mo
-@dirrm share/gnome/omf/monkey-bubble
-@dirrm share/gnome/monkey-bubble/sounds
-@dirrm share/gnome/monkey-bubble/glade
-@dirrm share/gnome/monkey-bubble/gfx/snake
-@dirrm share/gnome/monkey-bubble/gfx/number
-@dirrm share/gnome/monkey-bubble/gfx/frozen-bubble
-@dirrm share/gnome/monkey-bubble/gfx/bubbles
-@dirrm share/gnome/monkey-bubble/gfx
-@dirrm share/gnome/monkey-bubble
+@dirrm share/omf/monkey-bubble
+@dirrm share/monkey-bubble/sounds
+@dirrm share/monkey-bubble/glade
+@dirrm share/monkey-bubble/gfx/snake
+@dirrm share/monkey-bubble/gfx/number
+@dirrm share/monkey-bubble/gfx/frozen-bubble
+@dirrm share/monkey-bubble/gfx/bubbles
+@dirrm share/monkey-bubble/gfx
+@dirrm share/monkey-bubble
 @dirrm share/gnome/help/monkey-bubble/fr
 @dirrm share/gnome/help/monkey-bubble/C
 @dirrm share/gnome/help/monkey-bubble
+@dirrmtry share/applications