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

13 files changed, 148 insertions, 147 deletions

diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile
index bff0f1947341..8761fdacc93d 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 f16b427c6d04..c9b65b336552 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 e75d46f8d072..7b4bf935c554 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
diff --git a/x11-clocks/gdesklets-countdown/Makefile b/x11-clocks/gdesklets-countdown/Makefile
index 992341e22f70..8e032390c8d0 100644
--- a/x11-clocks/gdesklets-countdown/Makefile
+++ b/x11-clocks/gdesklets-countdown/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	countdown
 PORTVERSION=	0.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -23,7 +23,7 @@ USE_XLIB=	yes
 USE_PYTHON=	yes
 
 NAME=		Countdown
-DATADIR=	${PREFIX}/share/gnome
+DATADIR=	${PREFIX}/share
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 do-build:
diff --git a/x11-clocks/gdesklets-countdown/pkg-message b/x11-clocks/gdesklets-countdown/pkg-message
index 444cfc57fe16..9fd7bd2d6086 100644
--- a/x11-clocks/gdesklets-countdown/pkg-message
+++ b/x11-clocks/gdesklets-countdown/pkg-message
@@ -1,16 +1,16 @@
 ##
 To view the README:
 
-	cat %%PREFIX%%/share/gnome/gdesklets/Displays/Countdown/README
-	cat %%PREFIX%%/share/gnome/gdesklets/Sensors/Countdown/README
+	cat %%PREFIX%%/share/gdesklets/Displays/Countdown/README
+	cat %%PREFIX%%/share/gdesklets/Sensors/Countdown/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/Countdown/Countdown.display
+	gdesklets open %%PREFIX%%/share/gdesklets/Displays/Countdown/Countdown.display
 
 NOTE: Be sure to login as your user when you use the gdesklets command,
       as the configuration will be stored in the ~/.gdesklets/ directory.
diff --git a/x11-clocks/gdesklets-countdown/pkg-plist b/x11-clocks/gdesklets-countdown/pkg-plist
index 2cf75c0f8eb7..feab11e48c57 100644
--- a/x11-clocks/gdesklets-countdown/pkg-plist
+++ b/x11-clocks/gdesklets-countdown/pkg-plist
@@ -1,16 +1,16 @@
-share/gnome/gdesklets/Displays/Countdown/Countdown.display
-share/gnome/gdesklets/Displays/Countdown/README
-share/gnome/gdesklets/Displays/Countdown/gfx/frame.png
-share/gnome/gdesklets/Displays/Countdown/gfx/safari1.png
-share/gnome/gdesklets/Displays/Countdown/gfx/safari2.png
-share/gnome/gdesklets/Displays/Countdown/gfx/safari3.png
-share/gnome/gdesklets/Sensors/Countdown/__init__.py
-share/gnome/gdesklets/Sensors/Countdown/__init__.pyc
-share/gnome/gdesklets/Sensors/Countdown/__init__.pyo
-share/gnome/gdesklets/Sensors/LTVFontSelector/__init__.py
-share/gnome/gdesklets/Sensors/LTVFontSelector/__init__.pyc
-share/gnome/gdesklets/Sensors/LTVFontSelector/__init__.pyo
-@dirrm share/gnome/gdesklets/Sensors/LTVFontSelector
-@dirrm share/gnome/gdesklets/Sensors/Countdown
-@dirrm share/gnome/gdesklets/Displays/Countdown/gfx
-@dirrm share/gnome/gdesklets/Displays/Countdown
+share/gdesklets/Displays/Countdown/Countdown.display
+share/gdesklets/Displays/Countdown/README
+share/gdesklets/Displays/Countdown/gfx/frame.png
+share/gdesklets/Displays/Countdown/gfx/safari1.png
+share/gdesklets/Displays/Countdown/gfx/safari2.png
+share/gdesklets/Displays/Countdown/gfx/safari3.png
+share/gdesklets/Sensors/Countdown/__init__.py
+share/gdesklets/Sensors/Countdown/__init__.pyc
+share/gdesklets/Sensors/Countdown/__init__.pyo
+share/gdesklets/Sensors/LTVFontSelector/__init__.py
+share/gdesklets/Sensors/LTVFontSelector/__init__.pyc
+share/gdesklets/Sensors/LTVFontSelector/__init__.pyo
+@dirrm share/gdesklets/Sensors/LTVFontSelector
+@dirrm share/gdesklets/Sensors/Countdown
+@dirrm share/gdesklets/Displays/Countdown/gfx
+@dirrm share/gdesklets/Displays/Countdown
diff --git a/x11-clocks/gdesklets-ebichuclock/Makefile b/x11-clocks/gdesklets-ebichuclock/Makefile
index a6b2f61904ef..ec65f90095cd 100644
--- a/x11-clocks/gdesklets-ebichuclock/Makefile
+++ b/x11-clocks/gdesklets-ebichuclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebichuclock
 PORTVERSION=	0.1.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -16,13 +16,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A very simple clock with a small Ebichu picture in it
 
 RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets \
-		${LOCALBASE}/share/gnome/gdesklets/Sensors/Clock/__init__.py:${PORTSDIR}/x11-clocks/gdesklets-clock
+		${LOCALBASE}/share/gdesklets/Sensors/Clock/__init__.py:${PORTSDIR}/x11-clocks/gdesklets-clock
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
 
 NAME=		ebichuclock
-DATADIR=	${PREFIX}/share/gnome
+DATADIR=	${PREFIX}/share
 PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/x11-clocks/gdesklets-ebichuclock/pkg-message b/x11-clocks/gdesklets-ebichuclock/pkg-message
index 6410433455a2..f1fd712ef551 100644
--- a/x11-clocks/gdesklets-ebichuclock/pkg-message
+++ b/x11-clocks/gdesklets-ebichuclock/pkg-message
@@ -1,9 +1,9 @@
 
 To list displays installed by this port:
 
-    ls %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%
+    ls %%PREFIX%%/share/gdesklets/Displays/%%NAME%%
 
 To add this desklet to your desktop:
 
-    gdesklets open %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/<name>.display
+    gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/<name>.display
 
diff --git a/x11-clocks/gdesklets-ebichuclock/pkg-plist b/x11-clocks/gdesklets-ebichuclock/pkg-plist
index 3b7773ea451f..4e4807c622e2 100644
--- a/x11-clocks/gdesklets-ebichuclock/pkg-plist
+++ b/x11-clocks/gdesklets-ebichuclock/pkg-plist
@@ -1,11 +1,11 @@
-share/gnome/gdesklets/Displays/ebichuclock/README
-share/gnome/gdesklets/Displays/ebichuclock/ebichuclock-happy.display
-share/gnome/gdesklets/Displays/ebichuclock/ebichuclock-pie.display
-share/gnome/gdesklets/Displays/ebichuclock/ebichuclock-xface.display
-share/gnome/gdesklets/Displays/ebichuclock/ebichuclock.display
-share/gnome/gdesklets/Displays/ebichuclock/gfx/ebichu0.png
-share/gnome/gdesklets/Displays/ebichuclock/gfx/ebichu1.png
-share/gnome/gdesklets/Displays/ebichuclock/gfx/ebichu2.png
-share/gnome/gdesklets/Displays/ebichuclock/gfx/ebichuclock.png
-@dirrm share/gnome/gdesklets/Displays/ebichuclock/gfx
-@dirrm share/gnome/gdesklets/Displays/ebichuclock
+share/gdesklets/Displays/ebichuclock/README
+share/gdesklets/Displays/ebichuclock/ebichuclock-happy.display
+share/gdesklets/Displays/ebichuclock/ebichuclock-pie.display
+share/gdesklets/Displays/ebichuclock/ebichuclock-xface.display
+share/gdesklets/Displays/ebichuclock/ebichuclock.display
+share/gdesklets/Displays/ebichuclock/gfx/ebichu0.png
+share/gdesklets/Displays/ebichuclock/gfx/ebichu1.png
+share/gdesklets/Displays/ebichuclock/gfx/ebichu2.png
+share/gdesklets/Displays/ebichuclock/gfx/ebichuclock.png
+@dirrm share/gdesklets/Displays/ebichuclock/gfx
+@dirrm share/gdesklets/Displays/ebichuclock
diff --git a/x11-clocks/gtubeclock/Makefile b/x11-clocks/gtubeclock/Makefile
index e5cf1ff262f3..addfc48e34d4 100644
--- a/x11-clocks/gtubeclock/Makefile
+++ b/x11-clocks/gtubeclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtubeclock
 PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.bonnyswan.com/gtubeclock/downloads/
 
diff --git a/x11-clocks/gtubeclock/pkg-plist b/x11-clocks/gtubeclock/pkg-plist
index f10c80c9fbb6..821646a4de49 100644
--- a/x11-clocks/gtubeclock/pkg-plist
+++ b/x11-clocks/gtubeclock/pkg-plist
@@ -1,33 +1,34 @@
 bin/gtubeclock
-share/gnome/applications/gtubeclock.desktop
-share/gnome/gtubeclock/gtubeclock.settings
-share/gnome/gtubeclock/pixmaps/newclock/1-0.png
-share/gnome/gtubeclock/pixmaps/newclock/1-1.png
-share/gnome/gtubeclock/pixmaps/newclock/1-2.png
-share/gnome/gtubeclock/pixmaps/newclock/1-3.png
-share/gnome/gtubeclock/pixmaps/newclock/1-4.png
-share/gnome/gtubeclock/pixmaps/newclock/1-5.png
-share/gnome/gtubeclock/pixmaps/newclock/1-6.png
-share/gnome/gtubeclock/pixmaps/newclock/1-7.png
-share/gnome/gtubeclock/pixmaps/newclock/1-8.png
-share/gnome/gtubeclock/pixmaps/newclock/1-9.png
-share/gnome/gtubeclock/pixmaps/newclock/AM.png
-share/gnome/gtubeclock/pixmaps/newclock/Background.png
-share/gnome/gtubeclock/pixmaps/newclock/PM.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-0.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-1.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-2.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-3.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-4.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-5.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-6.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-7.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-8.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-9.png
-share/gnome/gtubeclock/pixmaps/tubeclock/Background-scaled.png
-share/gnome/gtubeclock/pixmaps/tubeclock/Background.png
-share/gnome/gtubeclock/pixmaps/tubeclock/Reflection.png
-@dirrm share/gnome/gtubeclock/pixmaps/tubeclock
-@dirrm share/gnome/gtubeclock/pixmaps/newclock
-@dirrm share/gnome/gtubeclock/pixmaps
-@dirrm share/gnome/gtubeclock
+share/applications/gtubeclock.desktop
+share/gtubeclock/gtubeclock.settings
+share/gtubeclock/pixmaps/newclock/1-0.png
+share/gtubeclock/pixmaps/newclock/1-1.png
+share/gtubeclock/pixmaps/newclock/1-2.png
+share/gtubeclock/pixmaps/newclock/1-3.png
+share/gtubeclock/pixmaps/newclock/1-4.png
+share/gtubeclock/pixmaps/newclock/1-5.png
+share/gtubeclock/pixmaps/newclock/1-6.png
+share/gtubeclock/pixmaps/newclock/1-7.png
+share/gtubeclock/pixmaps/newclock/1-8.png
+share/gtubeclock/pixmaps/newclock/1-9.png
+share/gtubeclock/pixmaps/newclock/AM.png
+share/gtubeclock/pixmaps/newclock/Background.png
+share/gtubeclock/pixmaps/newclock/PM.png
+share/gtubeclock/pixmaps/tubeclock/1-0.png
+share/gtubeclock/pixmaps/tubeclock/1-1.png
+share/gtubeclock/pixmaps/tubeclock/1-2.png
+share/gtubeclock/pixmaps/tubeclock/1-3.png
+share/gtubeclock/pixmaps/tubeclock/1-4.png
+share/gtubeclock/pixmaps/tubeclock/1-5.png
+share/gtubeclock/pixmaps/tubeclock/1-6.png
+share/gtubeclock/pixmaps/tubeclock/1-7.png
+share/gtubeclock/pixmaps/tubeclock/1-8.png
+share/gtubeclock/pixmaps/tubeclock/1-9.png
+share/gtubeclock/pixmaps/tubeclock/Background-scaled.png
+share/gtubeclock/pixmaps/tubeclock/Background.png
+share/gtubeclock/pixmaps/tubeclock/Reflection.png
+@dirrm share/gtubeclock/pixmaps/tubeclock
+@dirrm share/gtubeclock/pixmaps/newclock
+@dirrm share/gtubeclock/pixmaps
+@dirrm share/gtubeclock
+@dirrmtry share/applications
diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile
index dc44e09a4570..5d6ed958eb3e 100644
--- a/x11-clocks/sanduhr/Makefile
+++ b/x11-clocks/sanduhr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sanduhr
 PORTVERSION=	1.93
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://seehuhn.de/data/
 
diff --git a/x11-clocks/sanduhr/pkg-plist b/x11-clocks/sanduhr/pkg-plist
index f7eb4b32d616..bd9b75d66fe6 100644
--- a/x11-clocks/sanduhr/pkg-plist
+++ b/x11-clocks/sanduhr/pkg-plist
@@ -1,36 +1,36 @@
 bin/sanduhr
 libdata/bonobo/servers/sanduhr.server
-share/locale/de/LC_MESSAGES/sanduhr.mo
 share/gnome/apps/Utilities/sanduhr.desktop
-share/gnome/help/sanduhr/C/sanduhr.xml
-share/gnome/help/sanduhr/C/factoryref.xml
 share/gnome/help/sanduhr/C/alarmref.xml
+share/gnome/help/sanduhr/C/factoryref.xml
+share/gnome/help/sanduhr/C/sanduhr.xml
 share/gnome/help/sanduhr/C/timerref.xml
 share/gnome/help/sanduhr/C/topic.dat
-share/gnome/help/sanduhr/de/sanduhr.xml
-share/gnome/help/sanduhr/de/factoryref.xml
 share/gnome/help/sanduhr/de/alarmref.xml
+share/gnome/help/sanduhr/de/factoryref.xml
+share/gnome/help/sanduhr/de/sanduhr.xml
 share/gnome/help/sanduhr/de/timerref.xml
-share/gnome/idl/sanduhr.idl
-share/gnome/omf/sanduhr/sanduhr-C.omf
-share/gnome/omf/sanduhr/sanduhr-de.omf
-share/gnome/pixmaps/sanduhr/default/back.png
-share/gnome/pixmaps/sanduhr/default/front.png
-share/gnome/pixmaps/sanduhr/default/mask.png
-share/gnome/pixmaps/sanduhr/steel/back.png
-share/gnome/pixmaps/sanduhr/steel/front.png
-share/gnome/pixmaps/sanduhr/steel/mask.png
-share/gnome/pixmaps/sanduhr/about.png
-share/gnome/pixmaps/sanduhr/logo.png
-share/gnome/pixmaps/sanduhr/icon.xpm
-share/gnome/sounds/sanduhr/bell.wav
-@dirrmtry share/gnome/pixmaps/sanduhr/steel
-@dirrmtry share/gnome/pixmaps/sanduhr/default
-@dirrmtry share/gnome/pixmaps/sanduhr
-@dirrmtry share/gnome/help/sanduhr/de/figures
-@dirrmtry share/gnome/help/sanduhr/de
-@dirrmtry share/gnome/help/sanduhr/C/figures
-@dirrmtry share/gnome/help/sanduhr/C
-@dirrmtry share/gnome/help/sanduhr
-@dirrmtry share/gnome/sounds/sanduhr
-@dirrmtry share/gnome/omf/sanduhr
+share/idl/sanduhr.idl
+share/locale/de/LC_MESSAGES/sanduhr.mo
+share/omf/sanduhr/sanduhr-C.omf
+share/omf/sanduhr/sanduhr-de.omf
+share/pixmaps/sanduhr/about.png
+share/pixmaps/sanduhr/default/back.png
+share/pixmaps/sanduhr/default/front.png
+share/pixmaps/sanduhr/default/mask.png
+share/pixmaps/sanduhr/icon.xpm
+share/pixmaps/sanduhr/logo.png
+share/pixmaps/sanduhr/steel/back.png
+share/pixmaps/sanduhr/steel/front.png
+share/pixmaps/sanduhr/steel/mask.png
+share/sounds/sanduhr/bell.wav
+@dirrm share/sounds/sanduhr
+@dirrm share/pixmaps/sanduhr/steel
+@dirrm share/pixmaps/sanduhr/default
+@dirrm share/pixmaps/sanduhr
+@dirrm share/omf/sanduhr
+@dirrm share/gnome/help/sanduhr/de/figures
+@dirrm share/gnome/help/sanduhr/de
+@dirrm share/gnome/help/sanduhr/C/figures
+@dirrm share/gnome/help/sanduhr/C
+@dirrm share/gnome/help/sanduhr