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

diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile
index bff0f194734..8761fdacc93 100644
--- a/x11-clocks/gdesklets-clock/Makefile
+++ b/x11-clocks/gdesklets-clock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clock
 PORTVERSION=	0.32
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -23,7 +23,7 @@ USE_PYTHON=	yes
 USE_XLIB=	yes
 
 NAME=		Clock
-DATADIR=	${PREFIX}/share/gnome
+DATADIR=	${PREFIX}/share
 LANG=		de fr pt sq sr sr@Latn sv
 
 do-build:
diff --git a/x11-clocks/gdesklets-clock/pkg-message b/x11-clocks/gdesklets-clock/pkg-message
index f16b427c6d0..c9b65b33655 100644
--- a/x11-clocks/gdesklets-clock/pkg-message
+++ b/x11-clocks/gdesklets-clock/pkg-message
@@ -1,16 +1,16 @@
 ##
 To view the README:
 
-	cat ${PREFIX}/share/gnome/gdesklets/Displays/${name}/README
-	cat ${PREFIX}/share/gnome/gdesklets/Sensors/${name}/README
+	cat ${PREFIX}/share/gdesklets/Displays/${name}/README
+	cat ${PREFIX}/share/gdesklets/Sensors/${name}/README
 
 To view all installed applets:
 
-	ls ${PREFIX}/share/gnome/gdesklets/Displays
+	ls ${PREFIX}/share/gdesklets/Displays
 
 To use those applets:
 
-	gdesklets open ${PREFIX}/share/gnome/gdesklets/Displays/${name}/${name}.display
+	gdesklets open ${PREFIX}/share/gdesklets/Displays/${name}/${name}.display
 
 Replace ${name} with the correct name of the applets you want to use.
 
diff --git a/x11-clocks/gdesklets-clock/pkg-plist b/x11-clocks/gdesklets-clock/pkg-plist
index e75d46f8d07..7b4bf935c55 100644
--- a/x11-clocks/gdesklets-clock/pkg-plist
+++ b/x11-clocks/gdesklets-clock/pkg-plist
@@ -1,41 +1,41 @@
-share/gnome/gdesklets/Displays/Clock/README
-share/gnome/gdesklets/Displays/Clock/gfx/clock.png
-share/gnome/gdesklets/Displays/Clock/gfx/gnomeclock.png
-share/gnome/gdesklets/Displays/Clock/gfx/gnomeclock.xcf
-share/gnome/gdesklets/Displays/Clock/gfx/osXclock.png
-share/gnome/gdesklets/Displays/Clock/gfx/pocketwatch.png
-share/gnome/gdesklets/Displays/Clock/gfx/pocketwatch.xcf
-share/gnome/gdesklets/Displays/Clock/gfx/rafclock.png
-share/gnome/gdesklets/Displays/Clock/gnomeclock.display
-share/gnome/gdesklets/Displays/Clock/osXclock.display
-share/gnome/gdesklets/Displays/Clock/plainclock.display
-share/gnome/gdesklets/Displays/Clock/pocket-watch.display
-share/gnome/gdesklets/Displays/Clock/rafclock.display
-share/gnome/gdesklets/Sensors/Clock/README
-share/gnome/gdesklets/Sensors/Clock/__init__.py
-share/gnome/gdesklets/Sensors/Clock/locale/de/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/fr/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/pt/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/sq/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/sr/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/sv/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/timezones.dat
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sv/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sv
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sr@Latn/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sr@Latn
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sr/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sr
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sq/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sq
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/pt/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/pt
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/fr/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/fr
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/de/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/de
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale
-@dirrm share/gnome/gdesklets/Sensors/Clock
-@dirrm share/gnome/gdesklets/Displays/Clock/gfx
-@dirrm share/gnome/gdesklets/Displays/Clock
+share/gdesklets/Displays/Clock/README
+share/gdesklets/Displays/Clock/gfx/clock.png
+share/gdesklets/Displays/Clock/gfx/gnomeclock.png
+share/gdesklets/Displays/Clock/gfx/gnomeclock.xcf
+share/gdesklets/Displays/Clock/gfx/osXclock.png
+share/gdesklets/Displays/Clock/gfx/pocketwatch.png
+share/gdesklets/Displays/Clock/gfx/pocketwatch.xcf
+share/gdesklets/Displays/Clock/gfx/rafclock.png
+share/gdesklets/Displays/Clock/gnomeclock.display
+share/gdesklets/Displays/Clock/osXclock.display
+share/gdesklets/Displays/Clock/plainclock.display
+share/gdesklets/Displays/Clock/pocket-watch.display
+share/gdesklets/Displays/Clock/rafclock.display
+share/gdesklets/Sensors/Clock/README
+share/gdesklets/Sensors/Clock/__init__.py
+share/gdesklets/Sensors/Clock/locale/de/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/fr/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/pt/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/sq/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/sr/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/sv/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/timezones.dat
+@dirrm share/gdesklets/Sensors/Clock/locale/sv/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/sv
+@dirrm share/gdesklets/Sensors/Clock/locale/sr@Latn/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/sr@Latn
+@dirrm share/gdesklets/Sensors/Clock/locale/sr/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/sr
+@dirrm share/gdesklets/Sensors/Clock/locale/sq/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/sq
+@dirrm share/gdesklets/Sensors/Clock/locale/pt/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/pt
+@dirrm share/gdesklets/Sensors/Clock/locale/fr/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/fr
+@dirrm share/gdesklets/Sensors/Clock/locale/de/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/de
+@dirrm share/gdesklets/Sensors/Clock/locale
+@dirrm share/gdesklets/Sensors/Clock
+@dirrm share/gdesklets/Displays/Clock/gfx
+@dirrm share/gdesklets/Displays/Clock