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
author: marcus <marcus@FreeBSD.org> 2007-10-25 07:37:25 +0800
committer: marcus <marcus@FreeBSD.org> 2007-10-25 07:37:25 +0800
commit: 43bd9f14d9ce11690e9538bf3b03d3462faa6dbe (patch)
tree: da347910089a96d6d726b8bb080f62c773263828 /deskutils
parent: 2e669ed08a56339ee1a8b2a0573a30147f95bd82 (diff)
download: freebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.tar.gz
freebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.tar.zst
freebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.zip
98 files changed, 1421 insertions, 1289 deletions
diff --git a/deskutils/akamaru/Makefile b/deskutils/akamaru/Makefile
index deeb4c1d5125..6d41c9d0ea55 100644
--- a/deskutils/akamaru/Makefile
+++ b/deskutils/akamaru/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	akamaru
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://people.freedesktop.org/~krh/
 DISTNAME=	${PORTNAME}
diff --git a/deskutils/akamaru/files/patch-populate-dock.sh b/deskutils/akamaru/files/patch-populate-dock.sh
index 7b7a206d3754..f9d4757d1198 100644
--- a/deskutils/akamaru/files/patch-populate-dock.sh
+++ b/deskutils/akamaru/files/patch-populate-dock.sh
@@ -5,7 +5,7 @@
  # standard applications.
  
 -make install-schemas
-+GAPPs=/usr/local/share/gnome/applications
++GAPPs=/usr/local/share/applications
 +APPs=/usr/local/share/applications
  
  while read n file; do
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index e72de0b652fb..63c31accd02f 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -3,12 +3,12 @@
 # Whom:					FreeBSD GNOME Team
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/alacarte/Makefile,v 1.14 2007/02/13 06:29:20 mezz Exp $
+#    $MCom: ports/deskutils/alacarte/Makefile,v 1.17 2007/05/19 21:36:01 marcus Exp $
 #
 
 PORTNAME=	alacarte
 PORTVERSION=	0.11.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/alacarte/files/patch-Alacarte_util.py b/deskutils/alacarte/files/patch-Alacarte_util.py
index 94ad287792de..fa7e2d800ce2 100644
--- a/deskutils/alacarte/files/patch-Alacarte_util.py
+++ b/deskutils/alacarte/files/patch-Alacarte_util.py
@@ -5,7 +5,7 @@
  			if os.path.isfile(file_path):
  				return file_path
 -	file_path = os.path.join('/', 'usr', 'share', 'applications', file_id)
-+	file_path = os.path.join('/', '/usr/local', 'share', 'gnome', 'applications', file_id)
++	file_path = os.path.join('/', '/usr/local', 'share', 'applications', file_id)
  	if os.path.isfile(file_path):
  		return file_path
  	return False
@@ -14,7 +14,7 @@
  			if os.path.isfile(file_path):
  				return file_path
 -	file_path = os.path.join('/', 'usr', 'share', 'desktop-directories', file_id)
-+	file_path = os.path.join('/', '/usr/local', 'share', 'gnome', 'desktop-directories', file_id)
++	file_path = os.path.join('/', '/usr/local', 'share', 'desktop-directories', file_id)
  	if os.path.isfile(file_path):
  		return file_path
  	return False
diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index 05fdec35e5b6..45e0e1edd141 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -14,9 +14,9 @@ bin/alacarte
 %%PYTHON_SITELIBDIR%%/Alacarte/util.py
 %%PYTHON_SITELIBDIR%%/Alacarte/util.pyc
 %%PYTHON_SITELIBDIR%%/Alacarte/util.pyo
-share/gnome/alacarte/alacarte.glade
-share/gnome/alacarte/logo.svg
-share/gnome/applications/alacarte.desktop
+share/alacarte/alacarte.glade
+share/alacarte/logo.svg
+share/applications/alacarte.desktop
 share/icons/hicolor/22x22/apps/alacarte.png
 share/icons/hicolor/scalable/apps/alacarte.svg
 share/locale/ar/LC_MESSAGES/alacarte.mo
@@ -80,6 +80,8 @@ share/locale/vi/LC_MESSAGES/alacarte.mo
 share/locale/zh_CN/LC_MESSAGES/alacarte.mo
 share/locale/zh_HK/LC_MESSAGES/alacarte.mo
 share/locale/zh_TW/LC_MESSAGES/alacarte.mo
+@dirrm share/alacarte
+@dirrm %%PYTHON_SITELIBDIR%%/Alacarte
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
@@ -98,5 +100,4 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrm share/gnome/alacarte
-@dirrm %%PYTHON_SITELIBDIR%%/Alacarte
+@dirrmtry share/applications
diff --git a/deskutils/alexandria/Makefile b/deskutils/alexandria/Makefile
index d020b1c74270..3fb07392960c 100644
--- a/deskutils/alexandria/Makefile
+++ b/deskutils/alexandria/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alexandria
 PORTVERSION=	0.6.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	deskutils ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -44,9 +44,6 @@ CONFIGURE_ARGS=	"--prefix=${PREFIX}"
 IGNORE=		only works with Ruby 1.8.0 or later
 .endif
 
-post-extract:
-	@${MV} ${WRKSRC}/data/omf ${WRKSRC}/data/gnome/
-
 post-install:
 	@${MKDIR} ${LOCALBASE}/etc/gconf/schemas
 	@${INSTALL_DATA} ${WRKSRC}/schemas/alexandria.schemas \
diff --git a/deskutils/alexandria/pkg-plist b/deskutils/alexandria/pkg-plist
index 2f433b558197..d97785126cc3 100644
--- a/deskutils/alexandria/pkg-plist
+++ b/deskutils/alexandria/pkg-plist
@@ -102,7 +102,7 @@ share/gnome/help/alexandria/C/figures/alexandria_list_view_search.png
 share/gnome/help/alexandria/C/figures/alexandria_loaning.png
 share/gnome/help/alexandria/C/figures/alexandria_main_window.png
 share/gnome/help/alexandria/ChangeLog
-share/gnome/omf/alexandria/alexandria-C.omf
+share/omf/alexandria/alexandria-C.omf
 share/locale/cs/LC_MESSAGES/alexandria.mo
 share/locale/cy/LC_MESSAGES/alexandria.mo
 share/locale/de/LC_MESSAGES/alexandria.mo
@@ -114,7 +114,7 @@ share/locale/pl/LC_MESSAGES/alexandria.mo
 share/locale/pt/LC_MESSAGES/alexandria.mo
 share/locale/pt_BR/LC_MESSAGES/alexandria.mo
 share/locale/sv/LC_MESSAGES/alexandria.mo
-@dirrm share/gnome/omf/alexandria
+@dirrm share/omf/alexandria
 @dirrm share/gnome/help/alexandria/C/figures
 @dirrm share/gnome/help/alexandria/C
 @dirrm share/gnome/help/alexandria
diff --git a/deskutils/babytrans/Makefile b/deskutils/babytrans/Makefile
index 7faaa13feec5..25f08511876a 100644
--- a/deskutils/babytrans/Makefile
+++ b/deskutils/babytrans/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	babytrans
 PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTREVISION=	7
 CATEGORIES=	deskutils
 MASTER_SITES=	http://fjolliton.free.fr/babytrans/
 
@@ -33,6 +33,7 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${PREFIX}/share/applets/Utility
 	${INSTALL_DATA} ${WRKSRC}/config-file/dictionary ${DATADIR}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/deskutils/babytrans/pkg-plist b/deskutils/babytrans/pkg-plist
index 1c36495c2284..bcff32fc7815 100644
--- a/deskutils/babytrans/pkg-plist
+++ b/deskutils/babytrans/pkg-plist
@@ -1,6 +1,6 @@
 bin/babytrans
 etc/CORBA/servers/babytrans.gnorba
-share/gnome/applets/Utility/babytrans.desktop
+share/applets/Utility/babytrans.desktop
 share/locale/es/LC_MESSAGES/babytrans.mo
 share/locale/de/LC_MESSAGES/babytrans.mo
 share/locale/fr/LC_MESSAGES/babytrans.mo
diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile
index 36dfab9ec011..44dbaca2e2fe 100644
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chmsee
 PORTVERSION=	0.9.6
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://chmsee.gro.clinux.org/
 
diff --git a/deskutils/chmsee/pkg-plist b/deskutils/chmsee/pkg-plist
index 0700d5afdf11..e8facbfb2541 100644
--- a/deskutils/chmsee/pkg-plist
+++ b/deskutils/chmsee/pkg-plist
@@ -1,12 +1,12 @@
 bin/chmsee
-share/gnome/applications/chmsee.desktop
-share/gnome/chmsee/chmsee-splash.png
-share/gnome/chmsee/chmsee.glade
-share/gnome/chmsee/chmsee.html
-share/gnome/chmsee/chmsee.png
-share/gnome/mime-info/chmsee.keys
-share/gnome/mime-info/chmsee.mime
-share/gnome/pixmaps/chmsee.png
+share/applications/chmsee.desktop
+share/chmsee/chmsee-splash.png
+share/chmsee/chmsee.glade
+share/chmsee/chmsee.html
+share/chmsee/chmsee.png
+share/mime-info/chmsee.keys
+share/mime-info/chmsee.mime
+share/pixmaps/chmsee.png
 share/locale/zh_CN/LC_MESSAGES/chmsee.mo
-@dirrm share/gnome/chmsee
-@dirrmtry share/gnome/applications
+@dirrm share/chmsee
+@dirrmtry share/applications
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 1073f5aac0f4..f0ad50de167a 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.54 2007/03/14 11:58:47 ahze Exp $
+#   $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.69 2007/10/15 17:32:49 mezz Exp $
 #
 
 PORTNAME=	deskbar-applet
-PORTVERSION=	2.18.1
-PORTREVISION=	2
+PORTVERSION=	2.20.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -49,19 +48,17 @@ PLIST_SUB+=	EVO="@comment "
 
 .if !defined(DISPLAY)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+		${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
 .if !defined(PACKAGE_BUILDING)
 CONFIGURE_ENV+=	DISPLAY="localhost:1001"
 .endif
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|/usr/share/applications|${LOCALBASE}/share/gnome/applications|g'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/deskbar/handlers/mozilla.py \
-		${WRKSRC}/deskbar/Utils.py
+		${WRKSRC}/deskbar/core/Utils.py
 
 .if !defined(DISPLAY)
 pre-configure:
@@ -69,7 +66,7 @@ pre-configure:
 		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
 		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
 	fi
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+	@${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 
 post-configure:
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 829c3e5f9d93..e17a676e4227 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.18.1.tar.bz2) = 6e0ea0d4140f9e7b0ee75d819a74172f
-SHA256 (gnome2/deskbar-applet-2.18.1.tar.bz2) = 1f1b4ed0d7cd2948aeca7cae33600397218be0b072f105ca0fb05c52e2f1e278
-SIZE (gnome2/deskbar-applet-2.18.1.tar.bz2) = 646387
+MD5 (gnome2/deskbar-applet-2.20.1.tar.bz2) = ba23f3a629b6f7287ff905e76e395466
+SHA256 (gnome2/deskbar-applet-2.20.1.tar.bz2) = 3ff6c1e6f15e79ac6ddcc61a73f94c985a8cc33e536b55fbe7db76660aa13310
+SIZE (gnome2/deskbar-applet-2.20.1.tar.bz2) = 747044
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
deleted file mode 100644
index 4c68b77664cc..000000000000
--- a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- deskbar/Utils.py.orig	Tue Nov  1 20:32:51 2005
-+++ deskbar/Utils.py	Tue Nov  1 20:33:08 2005
-@@ -10,7 +10,7 @@
- 	
- 	sysdirs = os.getenv("XDG_DATA_DIRS")
- 	if sysdirs == None:
--		sysdirs = "/usr/local/share:/usr/share"
-+	    sysdirs = "/usr/local/share/gnome:/usr/local/share:/usr/share"
- 	
- 	dirs = "%s:%s" % (dirs, sysdirs)
- 	return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)]
diff --git a/deskutils/deskbar-applet/files/patch-deskbar___init__.py b/deskutils/deskbar-applet/files/patch-deskbar___init__.py
deleted file mode 100644
index dbe19007d25a..000000000000
--- a/deskutils/deskbar-applet/files/patch-deskbar___init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- deskbar/__init__.py.orig	Thu Sep  7 15:04:34 2006
-+++ deskbar/__init__.py	Thu Sep  7 15:04:50 2006
-@@ -26,7 +26,7 @@ if _check(name):
- if UNINSTALLED_DESKBAR:
- 	SHARED_DATA_DIR = abspath(join(dirname(__file__), '..', 'data'))
- else:
--	SHARED_DATA_DIR = join(DATA_DIR, "deskbar-applet")
-+	SHARED_DATA_DIR = join(DATA_DIR, "gnome", "deskbar-applet")
- print "Data Dir: %s" % SHARED_DATA_DIR
- 
- HANDLERS_DIR = []
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_core_Utils.py b/deskutils/deskbar-applet/files/patch-deskbar_core_Utils.py
new file mode 100644
index 000000000000..1a41213c334d
--- /dev/null
+++ b/deskutils/deskbar-applet/files/patch-deskbar_core_Utils.py
@@ -0,0 +1,11 @@
+--- deskbar/core/Utils.py.orig	2007-08-13 13:07:20.000000000 -0400
++++ deskbar/core/Utils.py	2007-08-14 14:35:19.000000000 -0400
+@@ -51,7 +51,7 @@ def get_xdg_data_dirs():
+     
+     sysdirs = os.getenv("XDG_DATA_DIRS")
+     if sysdirs == None:
+-        sysdirs = "/usr/local/share:/usr/share"
++        sysdirs = "/usr/local/share"
+     
+     dirs = "%s:%s" % (dirs, sysdirs)
+     return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)]
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
index 4b01cdd9be6f..aeb9dadaaadf 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
@@ -1,17 +1,17 @@
---- deskbar/deskbar-applet.py.orig	Mon May 29 19:20:47 2006
-+++ deskbar/deskbar-applet.py	Mon May 29 19:20:54 2006
-@@ -42,10 +42,10 @@ if hasattr(gettext, 'bind_textdomain_cod
- 	gettext.bind_textdomain_codeset('deskbar-applet','UTF-8')
+--- deskbar/deskbar-applet.py.orig	Tue Jul 10 15:28:29 2007
++++ deskbar/deskbar-applet.py	Tue Jul 10 15:29:43 2007
+@@ -43,10 +43,10 @@
+     gettext.bind_textdomain_codeset('deskbar-applet','UTF-8')
  gettext.textdomain('deskbar-applet')
  
 -locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
 -if hasattr(locale, 'bind_textdomain_codeset'):
--	locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
+-    locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
 -locale.textdomain('deskbar-applet')
 +#locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
 +#if hasattr(locale, 'bind_textdomain_codeset'):
-+#	locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
++#    locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
 +#locale.textdomain('deskbar-applet')
  
- import gtkexcepthook
- 
+ # Enable threads
+ gtk.gdk.threads_init()
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
deleted file mode 100644
index ffad36e44f87..000000000000
--- a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- deskbar/handlers/mozilla.py.orig	Wed Mar  1 13:32:12 2006
-+++ deskbar/handlers/mozilla.py	Wed Mar  1 13:33:19 2006
-@@ -189,6 +189,7 @@ class MozillaSearchHandler(deskbar.Handl
- 				get_firefox_home_file("searchplugins"),
- 				get_firefox_home_file("search"),
- 				expanduser("~/.mozilla/searchplugins"),
-+				"%%LOCALBASE%%/lib/firefox/searchplugins",
- 				"/usr/lib/firefox/searchplugins",
- 				"/usr/local/lib/firefox/searchplugins",
- 				"/usr/lib/mozilla-firefox/searchplugins",
-@@ -197,6 +198,7 @@ class MozillaSearchHandler(deskbar.Handl
- 			smart_dirs = [
- 				get_mozilla_home_file("search"),
- 				expanduser("~/.mozilla/searchplugins"),
-+				"%%LOCALBASE%%/lib/mozilla/searchplugins",
- 				"/usr/lib/mozilla/searchplugins",
- 				"/usr/local/lib/mozilla/searchplugins"]
- 		
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index f4f75074f823..3771bdc9096f 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -1,128 +1,180 @@
 lib/deskbar-applet/deskbar-applet
-lib/deskbar-applet/handlers/beagle-live.py
-lib/deskbar-applet/handlers/beagle-live.pyc
-lib/deskbar-applet/handlers/beagle-live.pyo
-lib/deskbar-applet/handlers/beagle-static.py
-lib/deskbar-applet/handlers/beagle-static.pyc
-lib/deskbar-applet/handlers/beagle-static.pyo
-lib/deskbar-applet/handlers/desklicious.py
-lib/deskbar-applet/handlers/desklicious.pyc
-lib/deskbar-applet/handlers/desklicious.pyo
-lib/deskbar-applet/handlers/epiphany.py
-lib/deskbar-applet/handlers/epiphany.pyc
-lib/deskbar-applet/handlers/epiphany.pyo
-%%EVO%%lib/deskbar-applet/handlers/evolution.py
-%%EVO%%lib/deskbar-applet/handlers/evolution.pyc
-%%EVO%%lib/deskbar-applet/handlers/evolution.pyo
-lib/deskbar-applet/handlers/files.py
-lib/deskbar-applet/handlers/files.pyc
-lib/deskbar-applet/handlers/files.pyo
-lib/deskbar-applet/handlers/galeon.py
-lib/deskbar-applet/handlers/galeon.pyc
-lib/deskbar-applet/handlers/galeon.pyo
-lib/deskbar-applet/handlers/gdmactions.py
-lib/deskbar-applet/handlers/gdmactions.pyc
-lib/deskbar-applet/handlers/gdmactions.pyo
-lib/deskbar-applet/handlers/history.py
-lib/deskbar-applet/handlers/history.pyc
-lib/deskbar-applet/handlers/history.pyo
-lib/deskbar-applet/handlers/iswitch-window.py
-lib/deskbar-applet/handlers/iswitch-window.pyc
-lib/deskbar-applet/handlers/iswitch-window.pyo
-lib/deskbar-applet/handlers/mozilla.py
-lib/deskbar-applet/handlers/mozilla.pyc
-lib/deskbar-applet/handlers/mozilla.pyo
-lib/deskbar-applet/handlers/programs.py
-lib/deskbar-applet/handlers/programs.pyc
-lib/deskbar-applet/handlers/programs.pyo
-lib/deskbar-applet/handlers/recent.py
-lib/deskbar-applet/handlers/recent.pyc
-lib/deskbar-applet/handlers/recent.pyo
-lib/deskbar-applet/handlers/web_address.py
-lib/deskbar-applet/handlers/web_address.pyc
-lib/deskbar-applet/handlers/web_address.pyo
-lib/deskbar-applet/handlers/yahoo.py
-lib/deskbar-applet/handlers/yahoo.pyc
-lib/deskbar-applet/handlers/yahoo.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.py
-%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Categories.py
-%%PYTHON_SITELIBDIR%%/deskbar/Categories.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Categories.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.py
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.py
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.py
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Handler.py
-%%PYTHON_SITELIBDIR%%/deskbar/Handler.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Handler.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Indexer.py
-%%PYTHON_SITELIBDIR%%/deskbar/Indexer.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Indexer.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.py
-%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Match.py
-%%PYTHON_SITELIBDIR%%/deskbar/Match.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Match.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.py
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.py
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.py
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.py
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Utils.py
-%%PYTHON_SITELIBDIR%%/deskbar/Utils.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Utils.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Watcher.py
-%%PYTHON_SITELIBDIR%%/deskbar/Watcher.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Watcher.pyo
+lib/deskbar-applet/modules-2.20-compatible/beagle-live.py
+lib/deskbar-applet/modules-2.20-compatible/beagle-live.pyc
+lib/deskbar-applet/modules-2.20-compatible/beagle-live.pyo
+lib/deskbar-applet/modules-2.20-compatible/beagle-static.py
+lib/deskbar-applet/modules-2.20-compatible/beagle-static.pyc
+lib/deskbar-applet/modules-2.20-compatible/beagle-static.pyo
+lib/deskbar-applet/modules-2.20-compatible/desklicious.py
+lib/deskbar-applet/modules-2.20-compatible/desklicious.pyc
+lib/deskbar-applet/modules-2.20-compatible/desklicious.pyo
+lib/deskbar-applet/modules-2.20-compatible/epiphany.py
+lib/deskbar-applet/modules-2.20-compatible/epiphany.pyc
+lib/deskbar-applet/modules-2.20-compatible/epiphany.pyo
+%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.py
+%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.pyc
+%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.pyo
+lib/deskbar-applet/modules-2.20-compatible/files.py
+lib/deskbar-applet/modules-2.20-compatible/files.pyc
+lib/deskbar-applet/modules-2.20-compatible/files.pyo
+lib/deskbar-applet/modules-2.20-compatible/gdmactions.py
+lib/deskbar-applet/modules-2.20-compatible/gdmactions.pyc
+lib/deskbar-applet/modules-2.20-compatible/gdmactions.pyo
+lib/deskbar-applet/modules-2.20-compatible/history.py
+lib/deskbar-applet/modules-2.20-compatible/history.pyc
+lib/deskbar-applet/modules-2.20-compatible/history.pyo
+lib/deskbar-applet/modules-2.20-compatible/iswitch-window.py
+lib/deskbar-applet/modules-2.20-compatible/iswitch-window.pyc
+lib/deskbar-applet/modules-2.20-compatible/iswitch-window.pyo
+lib/deskbar-applet/modules-2.20-compatible/mozilla.py
+lib/deskbar-applet/modules-2.20-compatible/mozilla.pyc
+lib/deskbar-applet/modules-2.20-compatible/mozilla.pyo
+lib/deskbar-applet/modules-2.20-compatible/programs.py
+lib/deskbar-applet/modules-2.20-compatible/programs.pyc
+lib/deskbar-applet/modules-2.20-compatible/programs.pyo
+lib/deskbar-applet/modules-2.20-compatible/recent.py
+lib/deskbar-applet/modules-2.20-compatible/recent.pyc
+lib/deskbar-applet/modules-2.20-compatible/recent.pyo
+lib/deskbar-applet/modules-2.20-compatible/web_address.py
+lib/deskbar-applet/modules-2.20-compatible/web_address.pyc
+lib/deskbar-applet/modules-2.20-compatible/web_address.pyo
+lib/deskbar-applet/modules-2.20-compatible/yahoo.py
+lib/deskbar-applet/modules-2.20-compatible/yahoo.pyc
+lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/BrowserMatch.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/BrowserMatch.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/BrowserMatch.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/Categories.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/Categories.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/Categories.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/CoreImpl.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/CoreImpl.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/CoreImpl.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/DeskbarHistory.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/DeskbarHistory.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/DeskbarHistory.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/GconfStore.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/GconfStore.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/GconfStore.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/Indexer.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/Indexer.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/Indexer.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/Keybinder.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/Keybinder.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/Keybinder.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleInstaller.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleInstaller.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleInstaller.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleList.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleList.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleList.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleLoader.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleLoader.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleLoader.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/ThreadPool.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/ThreadPool.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/ThreadPool.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/Utils.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/Utils.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/Utils.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/Watcher.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/Watcher.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/Watcher.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/_gnomedesktop.la
+%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/_gnomedesktop.so
+%%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/_keybinder.la
+%%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/_keybinder.so
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/NewStuffUpdater.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/NewStuffUpdater.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/NewStuffUpdater.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/__init__.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/defs.py
 %%PYTHON_SITELIBDIR%%/deskbar/defs.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/defs.pyo
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.py
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyc
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyo
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.la
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.so
-%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/_gdmclient.la
-%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/_gdmclient.so
-%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/_gnomedesktop.la
-%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/_gnomedesktop.so
 %%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.py
 %%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/iconentry/_iconentry.la
-%%PYTHON_SITELIBDIR%%/deskbar/iconentry/_iconentry.so
-%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/keybinder/_keybinder.la
-%%PYTHON_SITELIBDIR%%/deskbar/keybinder/_keybinder.so
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ActionsFactory.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ActionsFactory.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ActionsFactory.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/CopyToClipboardAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/CopyToClipboardAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/CopyToClipboardAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/GoToLocationAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/GoToLocationAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/GoToLocationAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenDesktopFileAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenDesktopFileAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenDesktopFileAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenFileAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenFileAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenFileAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithApplicationAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithApplicationAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithApplicationAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithNautilusAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithNautilusAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithNautilusAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendEmailToAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendEmailToAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendEmailToAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendFileViaEmailAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendFileViaEmailAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendFileViaEmailAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ShowUrlAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ShowUrlAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ShowUrlAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/__init__.pyo
+%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/__init__.py
+%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/__init__.pyc
+%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/__init__.pyo
+%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/_evolution.la
+%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/_evolution.so
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/_gdmclient.la
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/_gdmclient.so
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Controller.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Controller.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Controller.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Core.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Core.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Core.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Match.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Match.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Match.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Module.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Module.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Module.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/View.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/View.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/View.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/__init__.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.pyo
@@ -131,30 +183,21 @@ lib/deskbar-applet/handlers/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/About.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowController.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowController.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowController.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAppletButton.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAppletButton.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAppletButton.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacButtonUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacButtonUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacButtonUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacActionsTreeView.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacActionsTreeView.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacActionsTreeView.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyo
@@ -167,76 +210,79 @@ lib/deskbar-applet/handlers/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacItems.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacItems.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacItems.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacLayoutProvider.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacLayoutProvider.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacLayoutProvider.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacModel.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacModel.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacModel.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacPopupEntry.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacPopupEntry.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacPopupEntry.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacUIManager.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacUIManager.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacUIManager.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.py
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.py
-%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.py
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry/_iconentry.la
+%%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry/_iconentry.so
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/AccelEntry.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/AccelEntry.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/AccelEntry.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/DeskbarPreferences.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/DeskbarPreferences.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/DeskbarPreferences.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ErrorDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ErrorDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ErrorDialog.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ModuleListView.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ModuleListView.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ModuleListView.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ProgressbarDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ProgressbarDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ProgressbarDialog.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/__init__.pyo
 libdata/bonobo/servers/Deskbar_Applet.server
 libdata/pkgconfig/deskbar-applet.pc
-share/gnome/deskbar-applet/Deskbar_Applet.xml
-share/gnome/deskbar-applet/art/delicious.png
-share/gnome/deskbar-applet/art/deskbar-applet-panel-h.png
-share/gnome/deskbar-applet/art/deskbar-applet-panel-h.svg
-share/gnome/deskbar-applet/art/deskbar-applet-panel-v.png
-share/gnome/deskbar-applet/art/deskbar-applet-panel-v.svg
-share/gnome/deskbar-applet/art/epiphany-history.png
-share/gnome/deskbar-applet/art/folder-bookmark.png
-share/gnome/deskbar-applet/art/generic.png
-share/gnome/deskbar-applet/art/google.png
-share/gnome/deskbar-applet/art/gpm-suspend-to-disk.png
-share/gnome/deskbar-applet/art/gpm-suspend-to-ram.png
-share/gnome/deskbar-applet/art/yahoo.png
-share/gnome/deskbar-applet/mozilla-search.glade
-share/gnome/deskbar-applet/prefs-dialog.glade
-share/gnome/deskbar-applet/smart-bookmarks.glade
+%%DATADIR%%/Deskbar_Applet.xml
+%%DATADIR%%/art/delicious.png
+%%DATADIR%%/art/deskbar-applet-panel-h.png
+%%DATADIR%%/art/deskbar-applet-panel-h.svg
+%%DATADIR%%/art/deskbar-applet-panel-v.png
+%%DATADIR%%/art/deskbar-applet-panel-v.svg
+%%DATADIR%%/art/epiphany-history.png
+%%DATADIR%%/art/generic.png
+%%DATADIR%%/art/gpm-suspend-to-disk.png
+%%DATADIR%%/art/gpm-suspend-to-ram.png
+%%DATADIR%%/art/web-search.png
+%%DATADIR%%/art/yahoo.png
+%%DATADIR%%/mozilla-search.glade
+%%DATADIR%%/prefs-dialog.glade
+%%DATADIR%%/smart-bookmarks.glade
 share/gnome/help/deskbar/C/deskbar.xml
 share/gnome/help/deskbar/C/figures/deskbar-applet.png
 share/gnome/help/deskbar/C/legal.xml
-share/gnome/omf/deskbar/deskbar-C.omf
+share/gnome/help/deskbar/ca/deskbar.xml
+share/gnome/help/deskbar/ca/figures/deskbar-applet.png
+share/gnome/help/deskbar/ca/legal.xml
+share/gnome/help/deskbar/en_GB/deskbar.xml
+share/gnome/help/deskbar/en_GB/figures/deskbar-applet.png
+share/gnome/help/deskbar/en_GB/legal.xml
+share/gnome/help/deskbar/es/deskbar.xml
+share/gnome/help/deskbar/es/figures/deskbar-applet.png
+share/gnome/help/deskbar/es/legal.xml
+share/gnome/help/deskbar/fr/deskbar.xml
+share/gnome/help/deskbar/fr/figures/deskbar-applet.png
+share/gnome/help/deskbar/fr/legal.xml
+share/gnome/help/deskbar/oc/deskbar.xml
+share/gnome/help/deskbar/oc/figures/deskbar-applet.png
+share/gnome/help/deskbar/oc/legal.xml
+share/gnome/help/deskbar/sv/deskbar.xml
+share/gnome/help/deskbar/sv/figures/deskbar-applet.png
+share/gnome/help/deskbar/sv/legal.xml
+share/gnome/help/deskbar/uk/deskbar.xml
+share/gnome/help/deskbar/uk/figures/deskbar-applet.png
+share/gnome/help/deskbar/uk/legal.xml
 share/icons/hicolor/16x16/apps/deskbar-applet.png
 share/icons/hicolor/22x22/apps/deskbar-applet.png
 share/icons/hicolor/32x32/apps/deskbar-applet.png
@@ -244,6 +290,7 @@ share/icons/hicolor/48x48/apps/deskbar-applet.png
 share/icons/hicolor/scalable/apps/deskbar-applet.svg
 share/locale/ar/LC_MESSAGES/deskbar-applet.mo
 share/locale/be/LC_MESSAGES/deskbar-applet.mo
+share/locale/be@latin/LC_MESSAGES/deskbar-applet.mo
 share/locale/bg/LC_MESSAGES/deskbar-applet.mo
 share/locale/bn/LC_MESSAGES/deskbar-applet.mo
 share/locale/bn_IN/LC_MESSAGES/deskbar-applet.mo
@@ -283,6 +330,7 @@ share/locale/mr/LC_MESSAGES/deskbar-applet.mo
 share/locale/nb/LC_MESSAGES/deskbar-applet.mo
 share/locale/ne/LC_MESSAGES/deskbar-applet.mo
 share/locale/nl/LC_MESSAGES/deskbar-applet.mo
+share/locale/oc/LC_MESSAGES/deskbar-applet.mo
 share/locale/or/LC_MESSAGES/deskbar-applet.mo
 share/locale/pa/LC_MESSAGES/deskbar-applet.mo
 share/locale/pl/LC_MESSAGES/deskbar-applet.mo
@@ -290,6 +338,7 @@ share/locale/pt/LC_MESSAGES/deskbar-applet.mo
 share/locale/pt_BR/LC_MESSAGES/deskbar-applet.mo
 share/locale/ro/LC_MESSAGES/deskbar-applet.mo
 share/locale/ru/LC_MESSAGES/deskbar-applet.mo
+share/locale/si/LC_MESSAGES/deskbar-applet.mo
 share/locale/sk/LC_MESSAGES/deskbar-applet.mo
 share/locale/sl/LC_MESSAGES/deskbar-applet.mo
 share/locale/sq/LC_MESSAGES/deskbar-applet.mo
@@ -304,30 +353,57 @@ share/locale/vi/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_CN/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_HK/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
-@dirrm share/gnome/omf/deskbar
+share/omf/deskbar/deskbar-C.omf
+share/omf/deskbar/deskbar-ca.omf
+share/omf/deskbar/deskbar-en_GB.omf
+share/omf/deskbar/deskbar-es.omf
+share/omf/deskbar/deskbar-fr.omf
+share/omf/deskbar/deskbar-oc.omf
+share/omf/deskbar/deskbar-sv.omf
+share/omf/deskbar/deskbar-uk.omf
+@dirrm share/omf/deskbar
+@dirrm share/gnome/help/deskbar/uk/figures
+@dirrm share/gnome/help/deskbar/uk
+@dirrm share/gnome/help/deskbar/sv/figures
+@dirrm share/gnome/help/deskbar/sv
+@dirrm share/gnome/help/deskbar/oc/figures
+@dirrm share/gnome/help/deskbar/oc
+@dirrm share/gnome/help/deskbar/fr/figures
+@dirrm share/gnome/help/deskbar/fr
+@dirrm share/gnome/help/deskbar/es/figures
+@dirrm share/gnome/help/deskbar/es
+@dirrm share/gnome/help/deskbar/en_GB/figures
+@dirrm share/gnome/help/deskbar/en_GB
+@dirrm share/gnome/help/deskbar/ca/figures
+@dirrm share/gnome/help/deskbar/ca
 @dirrm share/gnome/help/deskbar/C/figures
 @dirrm share/gnome/help/deskbar/C
 @dirrm share/gnome/help/deskbar
-@dirrm share/gnome/deskbar-applet/art
-@dirrm share/gnome/deskbar-applet
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/updater
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/window
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac
+@dirrm %%DATADIR%%/art
+@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/preferences
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/osutils
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/keybinder
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/iconentry
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/gdmclient
-%%EVO%%@dirrm %%PYTHON_SITELIBDIR%%/deskbar/evolution
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/interfaces
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient
+%%EVO%%@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/actions
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/updater
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/keybinder
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
-@dirrm lib/deskbar-applet/handlers
+@dirrm lib/deskbar-applet/modules-2.20-compatible
 @dirrm lib/deskbar-applet
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -338,3 +414,5 @@ share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
diff --git a/deskutils/dlume/Makefile b/deskutils/dlume/Makefile
index f92f47a9fe07..e5700fb5f3d6 100644
--- a/deskutils/dlume/Makefile
+++ b/deskutils/dlume/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dlume
 PORTVERSION=	0.2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://clay.ll.pl/download/
 
@@ -21,7 +21,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		${PORTNAME}.1
-PLIST_FILES=	bin/dlume share/gnome/pixmaps/dlume.png
+PLIST_FILES=	bin/dlume share/pixmaps/dlume.png
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/src/Makefile.in
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 3157e986b081..a413c67fa423 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drivel
 PORTVERSION=	2.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -51,8 +51,6 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|datadir)/icons/gnome|prefix)/share/icons/gnome|g' \
-		${WRKSRC}/pixmaps/Makefile.in
 	@${REINPLACE_CMD} -e 's|;;|;|g' \
 		${WRKSRC}/src/journal.c \
 		${WRKSRC}/src/msg_queue.c
diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist
index 0633affae583..13446ae14673 100644
--- a/deskutils/drivel/pkg-plist
+++ b/deskutils/drivel/pkg-plist
@@ -1,39 +1,39 @@
 bin/drivel
-share/gnome/application-registry/drivel.applications
-share/gnome/applications/gnome-drivel.desktop
-share/gnome/drivel/glade/drivel.glade
-share/gnome/drivel/languages/livejournal.lang
+share/application-registry/drivel.applications
+share/applications/gnome-drivel.desktop
+share/drivel/glade/drivel.glade
+share/drivel/languages/livejournal.lang
 share/gnome/help/drivel/C/drivel.xml
 share/gnome/help/drivel/C/legal.xml
-share/gnome/mime-info/drivel.keys
-share/gnome/mime-info/drivel.mime
-share/gnome/omf/drivel/drivel-C.omf
-share/gnome/pixmaps/drivel-48.png
-share/gnome/pixmaps/drivel/advogato.png
-share/gnome/pixmaps/drivel/atom.png
-share/gnome/pixmaps/drivel/blogger.png
-share/gnome/pixmaps/drivel/checkbutton.xpm
-share/gnome/pixmaps/drivel/combobox.xpm
-share/gnome/pixmaps/drivel/community.png
-share/gnome/pixmaps/drivel/doublearrow.png
-share/gnome/pixmaps/drivel/drivel_splash.png
-share/gnome/pixmaps/drivel/drivel-24.png
-share/gnome/pixmaps/drivel/entry.xpm
-share/gnome/pixmaps/drivel/feed.png
-share/gnome/pixmaps/drivel/hscale.xpm
-share/gnome/pixmaps/drivel/insert_image.png
-share/gnome/pixmaps/drivel/insert_object.png
-share/gnome/pixmaps/drivel/leftarrow.png
-share/gnome/pixmaps/drivel/livejournal.png
-share/gnome/pixmaps/drivel/mt.png
-share/gnome/pixmaps/drivel/private.png
-share/gnome/pixmaps/drivel/protected.png
-share/gnome/pixmaps/drivel/public.png
-share/gnome/pixmaps/drivel/radiobutton.xpm
-share/gnome/pixmaps/drivel/rightarrow.png
-share/gnome/pixmaps/drivel/user.png
-share/gnome/pixmaps/drivel/tray_livejournal.png
-share/gnome/pixmaps/drivel/xmms.xpm
+share/mime-info/drivel.keys
+share/mime-info/drivel.mime
+share/omf/drivel/drivel-C.omf
+share/pixmaps/drivel-48.png
+share/pixmaps/drivel/advogato.png
+share/pixmaps/drivel/atom.png
+share/pixmaps/drivel/blogger.png
+share/pixmaps/drivel/checkbutton.xpm
+share/pixmaps/drivel/combobox.xpm
+share/pixmaps/drivel/community.png
+share/pixmaps/drivel/doublearrow.png
+share/pixmaps/drivel/drivel_splash.png
+share/pixmaps/drivel/drivel-24.png
+share/pixmaps/drivel/entry.xpm
+share/pixmaps/drivel/feed.png
+share/pixmaps/drivel/hscale.xpm
+share/pixmaps/drivel/insert_image.png
+share/pixmaps/drivel/insert_object.png
+share/pixmaps/drivel/leftarrow.png
+share/pixmaps/drivel/livejournal.png
+share/pixmaps/drivel/mt.png
+share/pixmaps/drivel/private.png
+share/pixmaps/drivel/protected.png
+share/pixmaps/drivel/public.png
+share/pixmaps/drivel/radiobutton.xpm
+share/pixmaps/drivel/rightarrow.png
+share/pixmaps/drivel/user.png
+share/pixmaps/drivel/tray_livejournal.png
+share/pixmaps/drivel/xmms.xpm
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-drivel.png
 share/locale/bg/LC_MESSAGES/drivel.mo
 share/locale/cs/LC_MESSAGES/drivel.mo
@@ -63,14 +63,15 @@ share/mime/packages/drivel.xml
 @unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true
 @dirrmtry share/icons/gnome/48x48/mimetypes
 @dirrmtry share/icons/gnome/48x48
-@dirrm share/gnome/pixmaps/drivel
-@dirrm share/gnome/omf/drivel
+@dirrm share/pixmaps/drivel
+@dirrm share/omf/drivel
 @dirrm share/gnome/help/drivel/C
 @dirrm share/gnome/help/drivel
-@dirrm share/gnome/drivel/languages
-@dirrm share/gnome/drivel/glade
-@dirrm share/gnome/drivel
+@dirrm share/drivel/languages
+@dirrm share/drivel/glade
+@dirrm share/drivel
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 874d9a3b45d1..d9ae146db0a7 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.17 2007/03/12 04:55:09 marcus Exp $
+#   $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.23 2007/09/17 12:31:53 ahze Exp $
 #
 
 PORTNAME=	jescs
-PORTVERSION=	2.10.0
+PORTVERSION=	2.12.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,8 +17,8 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sun Java Enterprise System Calendar Server provider for Evolution
 
-BUILD_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
-RUN_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
+BUILD_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
+RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
 
 USE_XLIB=	yes
 USE_BZIP2=	yes
@@ -29,8 +29,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-EVO_VERSION=	2.10
-PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.10"
+EVO_VERSION=	2.12
+PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.12"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libdir/bonobo/servers|prefix/libdata/bonobo/servers|g' \
diff --git a/deskutils/evolution-jescs/distinfo b/deskutils/evolution-jescs/distinfo
index 5f42c195d43c..afe88af55eba 100644
--- a/deskutils/evolution-jescs/distinfo
+++ b/deskutils/evolution-jescs/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-jescs-2.10.0.tar.bz2) = 954812c93a412162f773370b6fd4ec06
-SHA256 (evolution-jescs-2.10.0.tar.bz2) = f97518d07345b8729fe96d8f04bcfcf9d3326ecfa603328c9e7a270d606435b5
-SIZE (evolution-jescs-2.10.0.tar.bz2) = 523942
+MD5 (evolution-jescs-2.12.0.tar.bz2) = cbfb1eff0c72a608e9865c965ec33680
+SHA256 (evolution-jescs-2.12.0.tar.bz2) = 00f869ec7634168813ccea7bbc0bbefcddb25c0c94bc8e90387ff16984ccb7a5
+SIZE (evolution-jescs-2.12.0.tar.bz2) = 529290
diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist
index c32edfe77471..3dc6ccd58a07 100644
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@@ -3,12 +3,12 @@ lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.so
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.urls
 libdata/bonobo/servers/GNOME_Evolution_SunOne_Storage.server
 libexec/evolution/%%EVO_VERSION%%/evolution-jescs
-share/gnome/evolution/%%EVO_VERSION%%/images/sun-connector.png
-share/gnome/evolution/%%EVO_VERSION%%/images/sunone-invitations.png
-share/gnome/evolution/%%EVO_VERSION%%/images/sunone-invitations-mini.png
-share/gnome/evolution-jescs/glade/sunone-add-permission-dialog.glade
-share/gnome/evolution-jescs/glade/sunone-permissions-dialog.glade
-share/gnome/evolution-jescs/glade/sunone-subscription-dialog.glade
+share/evolution/%%EVO_VERSION%%/images/sun-connector.png
+share/evolution/%%EVO_VERSION%%/images/sunone-invitations.png
+share/evolution/%%EVO_VERSION%%/images/sunone-invitations-mini.png
+share/evolution-jescs/glade/sunone-add-permission-dialog.glade
+share/evolution-jescs/glade/sunone-permissions-dialog.glade
+share/evolution-jescs/glade/sunone-subscription-dialog.glade
 share/locale/ar/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@@ -24,6 +24,7 @@ share/locale/ja/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/nb/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/pt/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/pt_BR/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@@ -37,11 +38,13 @@ share/locale/vi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
-@dirrm share/gnome/evolution-jescs/glade
-@dirrm share/gnome/evolution-jescs
+@dirrm share/evolution-jescs/glade
+@dirrm share/evolution-jescs
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
diff --git a/deskutils/gdeskcal-skins/Makefile b/deskutils/gdeskcal-skins/Makefile
index 95c7c1993122..0fe1457c27bb 100644
--- a/deskutils/gdeskcal-skins/Makefile
+++ b/deskutils/gdeskcal-skins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdeskcal-skins
 PORTVERSION=	0.56
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils python gnome
 MASTER_SITES=	http://www.pycage.de/download/skins/gdeskcal/
 DISTNAME=
@@ -42,12 +42,12 @@ DATA_DIRS=	GNOME Grey_skin LCD Red_skin SimpleForDark XFCE august \
 		miderat_RTL tiny_and_simple tnf
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/gnome/gdeskcal
+	@${MKDIR} ${PREFIX}/share/gdeskcal
 .for d in ${DATA_DIRS}
-		@${MKDIR} ${PREFIX}/share/gnome/gdeskcal/skins/${d}
+		@${MKDIR} ${PREFIX}/share/gdeskcal/skins/${d}
 		@cd ${WRKSRC}/${d} && ${FIND} . | \
 	    		${CPIO} --quiet -pdm -L -R ${LIBOWN}:${LIBGRP}  \
-			${PREFIX}/share/gnome/gdeskcal/skins/${d}
+			${PREFIX}/share/gdeskcal/skins/${d}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/deskutils/gdeskcal-skins/pkg-plist b/deskutils/gdeskcal-skins/pkg-plist
index 68d5a49e26df..61889249cd33 100644
--- a/deskutils/gdeskcal-skins/pkg-plist
+++ b/deskutils/gdeskcal-skins/pkg-plist
@@ -1,94 +1,94 @@
-share/gnome/gdeskcal/skins/GNOME/bg.png
-share/gnome/gdeskcal/skins/GNOME/skin.xml
-share/gnome/gdeskcal/skins/GNOME/today.png
-share/gnome/gdeskcal/skins/Grey_skin/bg.png
-share/gnome/gdeskcal/skins/Grey_skin/home.png
-share/gnome/gdeskcal/skins/Grey_skin/next.png
-share/gnome/gdeskcal/skins/Grey_skin/prev.png
-share/gnome/gdeskcal/skins/Grey_skin/skin.xml
-share/gnome/gdeskcal/skins/Grey_skin/today.png
-share/gnome/gdeskcal/skins/LCD/bg.png
-share/gnome/gdeskcal/skins/LCD/bg.xcf
-share/gnome/gdeskcal/skins/LCD/home.png
-share/gnome/gdeskcal/skins/LCD/next.png
-share/gnome/gdeskcal/skins/LCD/prev.png
-share/gnome/gdeskcal/skins/LCD/skin.xml
-share/gnome/gdeskcal/skins/LCD/today.png
-share/gnome/gdeskcal/skins/Red_skin/bg.png
-share/gnome/gdeskcal/skins/Red_skin/home.png
-share/gnome/gdeskcal/skins/Red_skin/next.png
-share/gnome/gdeskcal/skins/Red_skin/prev.png
-share/gnome/gdeskcal/skins/Red_skin/skin.xml
-share/gnome/gdeskcal/skins/Red_skin/today.png
-share/gnome/gdeskcal/skins/SimpleForDark/skin.xml
-share/gnome/gdeskcal/skins/SimpleForDark/today.png
-share/gnome/gdeskcal/skins/XFCE/bg.png
-share/gnome/gdeskcal/skins/XFCE/skin.xml
-share/gnome/gdeskcal/skins/XFCE/today.png
-share/gnome/gdeskcal/skins/august/bg.png
-share/gnome/gdeskcal/skins/august/bg.xcf
-share/gnome/gdeskcal/skins/august/home.png
-share/gnome/gdeskcal/skins/august/next.png
-share/gnome/gdeskcal/skins/august/prev.png
-share/gnome/gdeskcal/skins/august/skin.xml
-share/gnome/gdeskcal/skins/august/today.png
-share/gnome/gdeskcal/skins/august_big_no_backgr/bg.xcf
-share/gnome/gdeskcal/skins/august_big_no_backgr/home.png
-share/gnome/gdeskcal/skins/august_big_no_backgr/next.png
-share/gnome/gdeskcal/skins/august_big_no_backgr/prev.png
-share/gnome/gdeskcal/skins/august_big_no_backgr/skin.xml
-share/gnome/gdeskcal/skins/august_big_no_backgr/today.png
-share/gnome/gdeskcal/skins/e/bg.png
-share/gnome/gdeskcal/skins/e/skin.xml
-share/gnome/gdeskcal/skins/e/today.png
-share/gnome/gdeskcal/skins/gorillerat/.xvpics/bg.png
-share/gnome/gdeskcal/skins/gorillerat/bg.png
-share/gnome/gdeskcal/skins/gorillerat/home.png
-share/gnome/gdeskcal/skins/gorillerat/next.png
-share/gnome/gdeskcal/skins/gorillerat/prev.png
-share/gnome/gdeskcal/skins/gorillerat/skin.xml
-share/gnome/gdeskcal/skins/gorillerat/today.png
-share/gnome/gdeskcal/skins/light_01/bg.png
-share/gnome/gdeskcal/skins/light_01/home.png
-share/gnome/gdeskcal/skins/light_01/next.png
-share/gnome/gdeskcal/skins/light_01/prev.png
-share/gnome/gdeskcal/skins/light_01/skin.xml
-share/gnome/gdeskcal/skins/light_01/skin.xml~
-share/gnome/gdeskcal/skins/light_02/bg.png
-share/gnome/gdeskcal/skins/light_02/home.png
-share/gnome/gdeskcal/skins/light_02/next.png
-share/gnome/gdeskcal/skins/light_02/prev.png
-share/gnome/gdeskcal/skins/light_02/skin.xml
-share/gnome/gdeskcal/skins/light_02/skin.xml~
-share/gnome/gdeskcal/skins/miderat_RTL/bg.png
-share/gnome/gdeskcal/skins/miderat_RTL/bg.xcf
-share/gnome/gdeskcal/skins/miderat_RTL/home.png
-share/gnome/gdeskcal/skins/miderat_RTL/next.png
-share/gnome/gdeskcal/skins/miderat_RTL/prev.png
-share/gnome/gdeskcal/skins/miderat_RTL/skin.xml
-share/gnome/gdeskcal/skins/miderat_RTL/today.png
-share/gnome/gdeskcal/skins/tiny_and_simple/skin.xml
-share/gnome/gdeskcal/skins/tnf/bg.png
-share/gnome/gdeskcal/skins/tnf/bg.xcf
-share/gnome/gdeskcal/skins/tnf/home.png
-share/gnome/gdeskcal/skins/tnf/next.png
-share/gnome/gdeskcal/skins/tnf/prev.png
-share/gnome/gdeskcal/skins/tnf/skin.xml
-share/gnome/gdeskcal/skins/tnf/today.png
-@dirrm share/gnome/gdeskcal/skins/tnf
-@dirrm share/gnome/gdeskcal/skins/tiny_and_simple
-@dirrm share/gnome/gdeskcal/skins/miderat_RTL
-@dirrm share/gnome/gdeskcal/skins/light_02
-@dirrm share/gnome/gdeskcal/skins/light_01
-@dirrm share/gnome/gdeskcal/skins/gorillerat/.xvpics
-@dirrm share/gnome/gdeskcal/skins/gorillerat
-@dirrm share/gnome/gdeskcal/skins/e
-@dirrm share/gnome/gdeskcal/skins/august_big_no_backgr
-@dirrm share/gnome/gdeskcal/skins/august
-@dirrm share/gnome/gdeskcal/skins/XFCE
-@dirrm share/gnome/gdeskcal/skins/SimpleForDark
-@dirrm share/gnome/gdeskcal/skins/Red_skin
-@dirrm share/gnome/gdeskcal/skins/LCD
-@dirrm share/gnome/gdeskcal/skins/Grey_skin
-@dirrm share/gnome/gdeskcal/skins/GNOME/.xvpics
-@dirrm share/gnome/gdeskcal/skins/GNOME
+share/gdeskcal/skins/GNOME/bg.png
+share/gdeskcal/skins/GNOME/skin.xml
+share/gdeskcal/skins/GNOME/today.png
+share/gdeskcal/skins/Grey_skin/bg.png
+share/gdeskcal/skins/Grey_skin/home.png
+share/gdeskcal/skins/Grey_skin/next.png
+share/gdeskcal/skins/Grey_skin/prev.png
+share/gdeskcal/skins/Grey_skin/skin.xml
+share/gdeskcal/skins/Grey_skin/today.png
+share/gdeskcal/skins/LCD/bg.png
+share/gdeskcal/skins/LCD/bg.xcf
+share/gdeskcal/skins/LCD/home.png
+share/gdeskcal/skins/LCD/next.png
+share/gdeskcal/skins/LCD/prev.png
+share/gdeskcal/skins/LCD/skin.xml
+share/gdeskcal/skins/LCD/today.png
+share/gdeskcal/skins/Red_skin/bg.png
+share/gdeskcal/skins/Red_skin/home.png
+share/gdeskcal/skins/Red_skin/next.png
+share/gdeskcal/skins/Red_skin/prev.png
+share/gdeskcal/skins/Red_skin/skin.xml
+share/gdeskcal/skins/Red_skin/today.png
+share/gdeskcal/skins/SimpleForDark/skin.xml
+share/gdeskcal/skins/SimpleForDark/today.png
+share/gdeskcal/skins/XFCE/bg.png
+share/gdeskcal/skins/XFCE/skin.xml
+share/gdeskcal/skins/XFCE/today.png
+share/gdeskcal/skins/august/bg.png
+share/gdeskcal/skins/august/bg.xcf
+share/gdeskcal/skins/august/home.png
+share/gdeskcal/skins/august/next.png
+share/gdeskcal/skins/august/prev.png
+share/gdeskcal/skins/august/skin.xml
+share/gdeskcal/skins/august/today.png
+share/gdeskcal/skins/august_big_no_backgr/bg.xcf
+share/gdeskcal/skins/august_big_no_backgr/home.png
+share/gdeskcal/skins/august_big_no_backgr/next.png
+share/gdeskcal/skins/august_big_no_backgr/prev.png
+share/gdeskcal/skins/august_big_no_backgr/skin.xml
+share/gdeskcal/skins/august_big_no_backgr/today.png
+share/gdeskcal/skins/e/bg.png
+share/gdeskcal/skins/e/skin.xml
+share/gdeskcal/skins/e/today.png
+share/gdeskcal/skins/gorillerat/.xvpics/bg.png
+share/gdeskcal/skins/gorillerat/bg.png
+share/gdeskcal/skins/gorillerat/home.png
+share/gdeskcal/skins/gorillerat/next.png
+share/gdeskcal/skins/gorillerat/prev.png
+share/gdeskcal/skins/gorillerat/skin.xml
+share/gdeskcal/skins/gorillerat/today.png
+share/gdeskcal/skins/light_01/bg.png
+share/gdeskcal/skins/light_01/home.png
+share/gdeskcal/skins/light_01/next.png
+share/gdeskcal/skins/light_01/prev.png
+share/gdeskcal/skins/light_01/skin.xml
+share/gdeskcal/skins/light_01/skin.xml~
+share/gdeskcal/skins/light_02/bg.png
+share/gdeskcal/skins/light_02/home.png
+share/gdeskcal/skins/light_02/next.png
+share/gdeskcal/skins/light_02/prev.png
+share/gdeskcal/skins/light_02/skin.xml
+share/gdeskcal/skins/light_02/skin.xml~
+share/gdeskcal/skins/miderat_RTL/bg.png
+share/gdeskcal/skins/miderat_RTL/bg.xcf
+share/gdeskcal/skins/miderat_RTL/home.png
+share/gdeskcal/skins/miderat_RTL/next.png
+share/gdeskcal/skins/miderat_RTL/prev.png
+share/gdeskcal/skins/miderat_RTL/skin.xml
+share/gdeskcal/skins/miderat_RTL/today.png
+share/gdeskcal/skins/tiny_and_simple/skin.xml
+share/gdeskcal/skins/tnf/bg.png
+share/gdeskcal/skins/tnf/bg.xcf
+share/gdeskcal/skins/tnf/home.png
+share/gdeskcal/skins/tnf/next.png
+share/gdeskcal/skins/tnf/prev.png
+share/gdeskcal/skins/tnf/skin.xml
+share/gdeskcal/skins/tnf/today.png
+@dirrm share/gdeskcal/skins/tnf
+@dirrm share/gdeskcal/skins/tiny_and_simple
+@dirrm share/gdeskcal/skins/miderat_RTL
+@dirrm share/gdeskcal/skins/light_02
+@dirrm share/gdeskcal/skins/light_01
+@dirrm share/gdeskcal/skins/gorillerat/.xvpics
+@dirrm share/gdeskcal/skins/gorillerat
+@dirrm share/gdeskcal/skins/e
+@dirrm share/gdeskcal/skins/august_big_no_backgr
+@dirrm share/gdeskcal/skins/august
+@dirrm share/gdeskcal/skins/XFCE
+@dirrm share/gdeskcal/skins/SimpleForDark
+@dirrm share/gdeskcal/skins/Red_skin
+@dirrm share/gdeskcal/skins/LCD
+@dirrm share/gdeskcal/skins/Grey_skin
+@dirrm share/gdeskcal/skins/GNOME/.xvpics
+@dirrm share/gdeskcal/skins/GNOME
diff --git a/deskutils/gdeskcal/Makefile b/deskutils/gdeskcal/Makefile
index 865cb3812ea4..a8b09ae4cd50 100644
--- a/deskutils/gdeskcal/Makefile
+++ b/deskutils/gdeskcal/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/gdeskcal/Makefile,v 1.2 2006/09/30 03:23:19 ahze Exp $
+#   $MCom: ports/deskutils/gdeskcal/Makefile,v 1.4 2007/07/23 20:22:27 mezz Exp $
+#
 
 PORTNAME=	gdeskcal
 PORTVERSION=	0.57.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils python gnome
 MASTER_SITES=	http://www.pycage.de/download/
 DISTNAME=	gDeskCal-${PORTVERSION:S/./_/g}
@@ -31,15 +32,15 @@ post-patch:
 		${WRKSRC}/code/values.py
 
 do-install:
-	${MKDIR} ${PREFIX}/share/gnome/gdeskcal
+	${MKDIR} ${PREFIX}/share/gdeskcal
 	for d in ${DATA_DIRS}; do \
-	    ${MKDIR} ${PREFIX}/share/gnome/gdeskcal/$$d ; \
+	    ${MKDIR} ${PREFIX}/share/gdeskcal/$$d ; \
 	    cd ${WRKSRC}/$$d && ${FIND} . | \
 	    	${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP}  \
-		${PREFIX}/share/gnome/gdeskcal/$$d ; \
+		${PREFIX}/share/gdeskcal/$$d ; \
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/gdeskcal \
-		${PREFIX}/share/gnome/gdeskcal
+		${PREFIX}/share/gdeskcal
 
 	${MKDIR} ${PREFIX}/share/locale/ar/LC_MESSAGES
 
@@ -49,6 +50,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/locale/${i}/LC_MESSAGES/gdeskcal.mo \
 		${PREFIX}/share/locale/${i}/LC_MESSAGES
 .endfor
-	${LN} -sf ${PREFIX}/share/gnome/gdeskcal/gdeskcal ${PREFIX}/bin/gdeskcal
+	${LN} -sf ${PREFIX}/share/gdeskcal/gdeskcal ${PREFIX}/bin/gdeskcal
 
 .include <bsd.port.mk>
diff --git a/deskutils/gdeskcal/pkg-plist b/deskutils/gdeskcal/pkg-plist
index 191d32eecfda..39caecee3d5f 100644
--- a/deskutils/gdeskcal/pkg-plist
+++ b/deskutils/gdeskcal/pkg-plist
@@ -1,68 +1,68 @@
 bin/gdeskcal
-share/gnome/gdeskcal/code/BGWatcher.py
-share/gnome/gdeskcal/code/Cal.py
-share/gnome/gdeskcal/code/CalLabel.py
-share/gnome/gdeskcal/code/CalMediator.py
-share/gnome/gdeskcal/code/CalWindow.py
-share/gnome/gdeskcal/code/Config.py
-share/gnome/gdeskcal/code/ConfigFormatLoader.py
-share/gnome/gdeskcal/code/ConfigLoader.py
-share/gnome/gdeskcal/code/FileWatcher.py
-share/gnome/gdeskcal/code/GlassWindow.py
-share/gnome/gdeskcal/code/ListBox.py
-share/gnome/gdeskcal/code/Menu.py
-share/gnome/gdeskcal/code/Navigation.py
-share/gnome/gdeskcal/code/Observable.py
-share/gnome/gdeskcal/code/SkinBrowser.py
-share/gnome/gdeskcal/code/TimeWatcher.py
-share/gnome/gdeskcal/code/__init__.py
-share/gnome/gdeskcal/code/cmdlineparser.py
-share/gnome/gdeskcal/code/configvalues.py
-share/gnome/gdeskcal/code/desktop.py
-share/gnome/gdeskcal/code/errormessage.py
-share/gnome/gdeskcal/code/formats.py
-share/gnome/gdeskcal/code/i18n.py
-share/gnome/gdeskcal/code/icon.py
-share/gnome/gdeskcal/code/planner/CalEditor.py
-share/gnome/gdeskcal/code/planner/Planner.py
-share/gnome/gdeskcal/code/planner/Popup.py
-share/gnome/gdeskcal/code/planner/__init__.py
-share/gnome/gdeskcal/code/planner/cal/CalEvent.py
-share/gnome/gdeskcal/code/planner/cal/Calendar.py
-share/gnome/gdeskcal/code/planner/cal/Date.py
-share/gnome/gdeskcal/code/planner/cal/RRule.py
-share/gnome/gdeskcal/code/planner/cal/Recurrences.py
-share/gnome/gdeskcal/code/planner/cal/__init__.py
-share/gnome/gdeskcal/code/planner/categories.py
-share/gnome/gdeskcal/code/planner/iCalLoader.py
-share/gnome/gdeskcal/code/planner/iCalWriter.py
-share/gnome/gdeskcal/code/sfrmapper.py
-share/gnome/gdeskcal/code/values.py
-share/gnome/gdeskcal/code/values.py.bak
-share/gnome/gdeskcal/data/config.xml
-share/gnome/gdeskcal/data/format.xml
-share/gnome/gdeskcal/data/format.xml~
-share/gnome/gdeskcal/data/gfx/business.png
-share/gnome/gdeskcal/data/gfx/favorites.png
-share/gnome/gdeskcal/data/gfx/icon.png
-share/gnome/gdeskcal/data/gfx/misc.png
-share/gnome/gdeskcal/data/gfx/phone.png
-share/gnome/gdeskcal/gdeskcal
-share/gnome/gdeskcal/skins/big_and_simple/skin.xml
-share/gnome/gdeskcal/skins/default/bg.png
-share/gnome/gdeskcal/skins/default/bg.xcf
-share/gnome/gdeskcal/skins/default/home.png
-share/gnome/gdeskcal/skins/default/next.png
-share/gnome/gdeskcal/skins/default/prev.png
-share/gnome/gdeskcal/skins/default/skin.xml
-share/gnome/gdeskcal/skins/default/today.png
-share/gnome/gdeskcal/skins/miderat/bg.png
-share/gnome/gdeskcal/skins/miderat/bg.xcf
-share/gnome/gdeskcal/skins/miderat/home.png
-share/gnome/gdeskcal/skins/miderat/next.png
-share/gnome/gdeskcal/skins/miderat/prev.png
-share/gnome/gdeskcal/skins/miderat/skin.xml
-share/gnome/gdeskcal/skins/miderat/today.png
+share/gdeskcal/code/BGWatcher.py
+share/gdeskcal/code/Cal.py
+share/gdeskcal/code/CalLabel.py
+share/gdeskcal/code/CalMediator.py
+share/gdeskcal/code/CalWindow.py
+share/gdeskcal/code/Config.py
+share/gdeskcal/code/ConfigFormatLoader.py
+share/gdeskcal/code/ConfigLoader.py
+share/gdeskcal/code/FileWatcher.py
+share/gdeskcal/code/GlassWindow.py
+share/gdeskcal/code/ListBox.py
+share/gdeskcal/code/Menu.py
+share/gdeskcal/code/Navigation.py
+share/gdeskcal/code/Observable.py
+share/gdeskcal/code/SkinBrowser.py
+share/gdeskcal/code/TimeWatcher.py
+share/gdeskcal/code/__init__.py
+share/gdeskcal/code/cmdlineparser.py
+share/gdeskcal/code/configvalues.py
+share/gdeskcal/code/desktop.py
+share/gdeskcal/code/errormessage.py
+share/gdeskcal/code/formats.py
+share/gdeskcal/code/i18n.py
+share/gdeskcal/code/icon.py
+share/gdeskcal/code/planner/CalEditor.py
+share/gdeskcal/code/planner/Planner.py
+share/gdeskcal/code/planner/Popup.py
+share/gdeskcal/code/planner/__init__.py
+share/gdeskcal/code/planner/cal/CalEvent.py
+share/gdeskcal/code/planner/cal/Calendar.py
+share/gdeskcal/code/planner/cal/Date.py
+share/gdeskcal/code/planner/cal/RRule.py
+share/gdeskcal/code/planner/cal/Recurrences.py
+share/gdeskcal/code/planner/cal/__init__.py
+share/gdeskcal/code/planner/categories.py
+share/gdeskcal/code/planner/iCalLoader.py
+share/gdeskcal/code/planner/iCalWriter.py
+share/gdeskcal/code/sfrmapper.py
+share/gdeskcal/code/values.py
+share/gdeskcal/code/values.py.bak
+share/gdeskcal/data/config.xml
+share/gdeskcal/data/format.xml
+share/gdeskcal/data/format.xml~
+share/gdeskcal/data/gfx/business.png
+share/gdeskcal/data/gfx/favorites.png
+share/gdeskcal/data/gfx/icon.png
+share/gdeskcal/data/gfx/misc.png
+share/gdeskcal/data/gfx/phone.png
+share/gdeskcal/gdeskcal
+share/gdeskcal/skins/big_and_simple/skin.xml
+share/gdeskcal/skins/default/bg.png
+share/gdeskcal/skins/default/bg.xcf
+share/gdeskcal/skins/default/home.png
+share/gdeskcal/skins/default/next.png
+share/gdeskcal/skins/default/prev.png
+share/gdeskcal/skins/default/skin.xml
+share/gdeskcal/skins/default/today.png
+share/gdeskcal/skins/miderat/bg.png
+share/gdeskcal/skins/miderat/bg.xcf
+share/gdeskcal/skins/miderat/home.png
+share/gdeskcal/skins/miderat/next.png
+share/gdeskcal/skins/miderat/prev.png
+share/gdeskcal/skins/miderat/skin.xml
+share/gdeskcal/skins/miderat/today.png
 share/locale/ar/LC_MESSAGES/gdeskcal.mo
 share/locale/bg/LC_MESSAGES/gdeskcal.mo
 share/locale/cs/LC_MESSAGES/gdeskcal.mo
@@ -89,13 +89,13 @@ share/locale/sv/LC_MESSAGES/gdeskcal.mo
 share/locale/tr/LC_MESSAGES/gdeskcal.mo
 share/locale/uk/LC_MESSAGES/gdeskcal.mo
 share/locale/zh_CN/LC_MESSAGES/gdeskcal.mo
-@dirrm share/gnome/gdeskcal/skins/miderat
-@dirrm share/gnome/gdeskcal/skins/default
-@dirrm share/gnome/gdeskcal/skins/big_and_simple
-@dirrm share/gnome/gdeskcal/skins
-@dirrm share/gnome/gdeskcal/data/gfx
-@dirrm share/gnome/gdeskcal/data
-@dirrm share/gnome/gdeskcal/code/planner/cal
-@dirrm share/gnome/gdeskcal/code/planner
-@dirrm share/gnome/gdeskcal/code
-@dirrm share/gnome/gdeskcal
+@dirrm share/gdeskcal/skins/miderat
+@dirrm share/gdeskcal/skins/default
+@dirrm share/gdeskcal/skins/big_and_simple
+@dirrm share/gdeskcal/skins
+@dirrm share/gdeskcal/data/gfx
+@dirrm share/gdeskcal/data
+@dirrm share/gdeskcal/code/planner/cal
+@dirrm share/gdeskcal/code/planner
+@dirrm share/gdeskcal/code
+@dirrm share/gdeskcal
diff --git a/deskutils/gdesklets-recentlyused/Makefile b/deskutils/gdesklets-recentlyused/Makefile
index 454c33f10775..971c5908869f 100644
--- a/deskutils/gdesklets-recentlyused/Makefile
+++ b/deskutils/gdesklets-recentlyused/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	recentlyused
 PORTVERSION=	0.6
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -24,7 +24,7 @@ SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 NAME=		RecentlyUsed
-DATADIR=	${PREFIX}/share/gnome
+DATADIR=	${PREFIX}/share
 
 do-build:
 	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
diff --git a/deskutils/gdesklets-recentlyused/files/pkg-message.in b/deskutils/gdesklets-recentlyused/files/pkg-message.in
index d2463720794d..7c5424401eb8 100644
--- a/deskutils/gdesklets-recentlyused/files/pkg-message.in
+++ b/deskutils/gdesklets-recentlyused/files/pkg-message.in
@@ -1,11 +1,11 @@
 ##
 To view the 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/deskutils/gdesklets-recentlyused/pkg-plist b/deskutils/gdesklets-recentlyused/pkg-plist
index f133cfaa0d7e..a61e83c09088 100644
--- a/deskutils/gdesklets-recentlyused/pkg-plist
+++ b/deskutils/gdesklets-recentlyused/pkg-plist
@@ -1,16 +1,16 @@
-share/gnome/gdesklets/Displays/RecentlyUsed/recently-used.display
-share/gnome/gdesklets/Sensors/RecentlyUsed/.recently-used
-share/gnome/gdesklets/Sensors/RecentlyUsed/AUTHORS
-share/gnome/gdesklets/Sensors/RecentlyUsed/Animator.py
-share/gnome/gdesklets/Sensors/RecentlyUsed/Icon.py
-share/gnome/gdesklets/Sensors/RecentlyUsed/MimeIcon.py
-share/gnome/gdesklets/Sensors/RecentlyUsed/RecentFile.py
-share/gnome/gdesklets/Sensors/RecentlyUsed/RecentParser.py
-share/gnome/gdesklets/Sensors/RecentlyUsed/RecentReader.py
-share/gnome/gdesklets/Sensors/RecentlyUsed/RfileSet.py
-share/gnome/gdesklets/Sensors/RecentlyUsed/TestReader.py
-share/gnome/gdesklets/Sensors/RecentlyUsed/TestRecent.py
-share/gnome/gdesklets/Sensors/RecentlyUsed/TestRfileSet.py
-share/gnome/gdesklets/Sensors/RecentlyUsed/__init__.py
-@dirrm share/gnome/gdesklets/Sensors/RecentlyUsed
-@dirrm share/gnome/gdesklets/Displays/RecentlyUsed
+share/gdesklets/Displays/RecentlyUsed/recently-used.display
+share/gdesklets/Sensors/RecentlyUsed/.recently-used
+share/gdesklets/Sensors/RecentlyUsed/AUTHORS
+share/gdesklets/Sensors/RecentlyUsed/Animator.py
+share/gdesklets/Sensors/RecentlyUsed/Icon.py
+share/gdesklets/Sensors/RecentlyUsed/MimeIcon.py
+share/gdesklets/Sensors/RecentlyUsed/RecentFile.py
+share/gdesklets/Sensors/RecentlyUsed/RecentParser.py
+share/gdesklets/Sensors/RecentlyUsed/RecentReader.py
+share/gdesklets/Sensors/RecentlyUsed/RfileSet.py
+share/gdesklets/Sensors/RecentlyUsed/TestReader.py
+share/gdesklets/Sensors/RecentlyUsed/TestRecent.py
+share/gdesklets/Sensors/RecentlyUsed/TestRfileSet.py
+share/gdesklets/Sensors/RecentlyUsed/__init__.py
+@dirrm share/gdesklets/Sensors/RecentlyUsed
+@dirrm share/gdesklets/Displays/RecentlyUsed
diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile
index b972bf473e83..953cc95346b8 100644
--- a/deskutils/gdesklets-starterbar/Makefile
+++ b/deskutils/gdesklets-starterbar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	starterbar
 PORTVERSION=	0.31.2
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -24,7 +24,7 @@ USE_PYTHON=	yes
 USE_XLIB=	yes
 
 NAME=		StarterBar
-DATADIR=	${PREFIX}/share/gnome
+DATADIR=	${PREFIX}/share
 PKGMESSAGE=	${WRKDIR}/pkg-message
 LANG=		ca cs de es fr hr nl pt pt_BR sq sr sr@Latn sv
 
diff --git a/deskutils/gdesklets-starterbar/files/pkg-message.in b/deskutils/gdesklets-starterbar/files/pkg-message.in
index f57d4a9d3f5d..d1e313daeccf 100644
--- a/deskutils/gdesklets-starterbar/files/pkg-message.in
+++ b/deskutils/gdesklets-starterbar/files/pkg-message.in
@@ -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 the 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%%/starterbar.display
+	gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/starterbar.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/deskutils/gdesklets-starterbar/pkg-plist b/deskutils/gdesklets-starterbar/pkg-plist
index e1dd7817298c..4c5636c9090c 100644
--- a/deskutils/gdesklets-starterbar/pkg-plist
+++ b/deskutils/gdesklets-starterbar/pkg-plist
@@ -1,75 +1,75 @@
-share/gnome/gdesklets/Displays/StarterBar/README
-share/gnome/gdesklets/Displays/StarterBar/gfx/bg-e.png
-share/gnome/gdesklets/Displays/StarterBar/gfx/bg-n.png
-share/gnome/gdesklets/Displays/StarterBar/gfx/bg-ne.png
-share/gnome/gdesklets/Displays/StarterBar/gfx/bg-nw.png
-share/gnome/gdesklets/Displays/StarterBar/gfx/bg-s.png
-share/gnome/gdesklets/Displays/StarterBar/gfx/bg-se.png
-share/gnome/gdesklets/Displays/StarterBar/gfx/bg-sw.png
-share/gnome/gdesklets/Displays/StarterBar/gfx/bg-w.png
-share/gnome/gdesklets/Displays/StarterBar/gfx/bg.png
-share/gnome/gdesklets/Displays/StarterBar/gfx/preview.png
-share/gnome/gdesklets/Displays/StarterBar/gfx/waterbath.png
-share/gnome/gdesklets/Displays/StarterBar/starterbar.display
-share/gnome/gdesklets/Sensors/StarterBar/.order
-share/gnome/gdesklets/Sensors/StarterBar/ChangeLog
-share/gnome/gdesklets/Sensors/StarterBar/FileWatcher.py
-share/gnome/gdesklets/Sensors/StarterBar/FileWatcher.pyc
-share/gnome/gdesklets/Sensors/StarterBar/FileWatcher.pyo
-share/gnome/gdesklets/Sensors/StarterBar/GConfWatcher.py
-share/gnome/gdesklets/Sensors/StarterBar/GConfWatcher.pyc
-share/gnome/gdesklets/Sensors/StarterBar/GConfWatcher.pyo
-share/gnome/gdesklets/Sensors/StarterBar/Icon.py
-share/gnome/gdesklets/Sensors/StarterBar/Icon.pyc
-share/gnome/gdesklets/Sensors/StarterBar/Icon.pyo
-share/gnome/gdesklets/Sensors/StarterBar/IconSet.py
-share/gnome/gdesklets/Sensors/StarterBar/IconSet.pyc
-share/gnome/gdesklets/Sensors/StarterBar/IconSet.pyo
-share/gnome/gdesklets/Sensors/StarterBar/README
-share/gnome/gdesklets/Sensors/StarterBar/__init__.py
-share/gnome/gdesklets/Sensors/StarterBar/__init__.pyc
-share/gnome/gdesklets/Sensors/StarterBar/__init__.pyo
-share/gnome/gdesklets/Sensors/StarterBar/home.desktop
-share/gnome/gdesklets/Sensors/StarterBar/locale/ca/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/cs/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/de/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/es/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/fr/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/hr/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/nl/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/pt/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/pt_BR/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/sq/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/sr/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/StarterBar/locale/sv/LC_MESSAGES/gdesklets.mo
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sv/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sv
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sr@Latn/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sr@Latn
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sr/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sr
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sq/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sq
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/pt_BR/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/pt_BR
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/pt/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/pt
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/nl/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/nl
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/hr/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/hr
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/fr/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/fr
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/es/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/es
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/de/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/de
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/cs/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/cs
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/ca/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/ca
-@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale
-@dirrm share/gnome/gdesklets/Sensors/StarterBar
-@dirrm share/gnome/gdesklets/Displays/StarterBar/gfx
-@dirrm share/gnome/gdesklets/Displays/StarterBar
+share/gdesklets/Displays/StarterBar/README
+share/gdesklets/Displays/StarterBar/gfx/bg-e.png
+share/gdesklets/Displays/StarterBar/gfx/bg-n.png
+share/gdesklets/Displays/StarterBar/gfx/bg-ne.png
+share/gdesklets/Displays/StarterBar/gfx/bg-nw.png
+share/gdesklets/Displays/StarterBar/gfx/bg-s.png
+share/gdesklets/Displays/StarterBar/gfx/bg-se.png
+share/gdesklets/Displays/StarterBar/gfx/bg-sw.png
+share/gdesklets/Displays/StarterBar/gfx/bg-w.png
+share/gdesklets/Displays/StarterBar/gfx/bg.png
+share/gdesklets/Displays/StarterBar/gfx/preview.png
+share/gdesklets/Displays/StarterBar/gfx/waterbath.png
+share/gdesklets/Displays/StarterBar/starterbar.display
+share/gdesklets/Sensors/StarterBar/.order
+share/gdesklets/Sensors/StarterBar/ChangeLog
+share/gdesklets/Sensors/StarterBar/FileWatcher.py
+share/gdesklets/Sensors/StarterBar/FileWatcher.pyc
+share/gdesklets/Sensors/StarterBar/FileWatcher.pyo
+share/gdesklets/Sensors/StarterBar/GConfWatcher.py
+share/gdesklets/Sensors/StarterBar/GConfWatcher.pyc
+share/gdesklets/Sensors/StarterBar/GConfWatcher.pyo
+share/gdesklets/Sensors/StarterBar/Icon.py
+share/gdesklets/Sensors/StarterBar/Icon.pyc
+share/gdesklets/Sensors/StarterBar/Icon.pyo
+share/gdesklets/Sensors/StarterBar/IconSet.py
+share/gdesklets/Sensors/StarterBar/IconSet.pyc
+share/gdesklets/Sensors/StarterBar/IconSet.pyo
+share/gdesklets/Sensors/StarterBar/README
+share/gdesklets/Sensors/StarterBar/__init__.py
+share/gdesklets/Sensors/StarterBar/__init__.pyc
+share/gdesklets/Sensors/StarterBar/__init__.pyo
+share/gdesklets/Sensors/StarterBar/home.desktop
+share/gdesklets/Sensors/StarterBar/locale/ca/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/cs/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/de/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/es/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/fr/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/hr/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/nl/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/pt/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/pt_BR/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/sq/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/sr/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/StarterBar/locale/sv/LC_MESSAGES/gdesklets.mo
+@dirrm share/gdesklets/Sensors/StarterBar/locale/sv/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/sv
+@dirrm share/gdesklets/Sensors/StarterBar/locale/sr@Latn/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/sr@Latn
+@dirrm share/gdesklets/Sensors/StarterBar/locale/sr/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/sr
+@dirrm share/gdesklets/Sensors/StarterBar/locale/sq/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/sq
+@dirrm share/gdesklets/Sensors/StarterBar/locale/pt_BR/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/pt_BR
+@dirrm share/gdesklets/Sensors/StarterBar/locale/pt/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/pt
+@dirrm share/gdesklets/Sensors/StarterBar/locale/nl/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/nl
+@dirrm share/gdesklets/Sensors/StarterBar/locale/hr/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/hr
+@dirrm share/gdesklets/Sensors/StarterBar/locale/fr/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/fr
+@dirrm share/gdesklets/Sensors/StarterBar/locale/es/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/es
+@dirrm share/gdesklets/Sensors/StarterBar/locale/de/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/de
+@dirrm share/gdesklets/Sensors/StarterBar/locale/cs/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/cs
+@dirrm share/gdesklets/Sensors/StarterBar/locale/ca/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/StarterBar/locale/ca
+@dirrm share/gdesklets/Sensors/StarterBar/locale
+@dirrm share/gdesklets/Sensors/StarterBar
+@dirrm share/gdesklets/Displays/StarterBar/gfx
+@dirrm share/gdesklets/Displays/StarterBar
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index f15efdcdbc5f..7b2b3323e45d 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdesklets
 PORTVERSION=	0.35.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.gdesklets.org/downloads/ \
 		http://www.pycage.de/download/${PORTNAME}/ \
@@ -45,8 +45,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays
-	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Sensors
+	@${MKDIR} ${PREFIX}/share/gdesklets/Displays
+	@${MKDIR} ${PREFIX}/share/gdesklets/Sensors
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/deskutils/gdesklets/files/patch-data::Makefile.in b/deskutils/gdesklets/files/patch-data::Makefile.in
deleted file mode 100644
index 467ca7297f20..000000000000
--- a/deskutils/gdesklets/files/patch-data::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.in.orig	Tue Nov 14 13:33:28 2006
-+++ data/Makefile.in	Tue Nov 14 13:36:09 2006
-@@ -252,7 +252,7 @@
- sharedmimepackagedir = $(sharedmimedir)/packages
- sharedmimepackage_in_files = gdesklets.xml.in
- sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
--mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
-+mimeicondir = $(prefix)/share/icons/gnome/48x48/mimetypes
- mimeicon_DATA = gnome-mime-application-x-gdesklets-display.png
- pixmapdir = $(PIXMAPDIR)
- pixmap_DATA = gdesklets.png
diff --git a/deskutils/gdesklets/files/patch-main::__init__.py b/deskutils/gdesklets/files/patch-main::__init__.py
deleted file mode 100644
index f9f873aa9852..000000000000
--- a/deskutils/gdesklets/files/patch-main::__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/__init__.py.orig	Thu Oct  5 16:14:40 2006
-+++ main/__init__.py	Tue Nov 14 13:38:57 2006
-@@ -7,7 +7,7 @@
- # gDesklets home paths
- HOME = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
- USERHOME = os.path.join(os.path.expanduser("~"), ".gdesklets")
--OLDHOME = os.path.join(HOME, os.pardir, os.pardir, "share", "gdesklets")
-+OLDHOME = os.path.join(HOME, os.pardir, os.pardir, "share", "gnome", "gdesklets")
- 
- # we need the DISPLAY variable
- try:
diff --git a/deskutils/gdesklets/pkg-install b/deskutils/gdesklets/pkg-install
index 366e159fd31e..8a8d0cb4a84f 100644
--- a/deskutils/gdesklets/pkg-install
+++ b/deskutils/gdesklets/pkg-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 if [ "$2" = "POST-INSTALL" ]; then
-	mkdir -p ${PKG_PREFIX}/share/gnome/gdesklets/Displays
+	mkdir -p ${PKG_PREFIX}/share/gdesklets/Displays
 fi
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index 7abc70cff434..d77246dc62c9 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -553,10 +553,10 @@ lib/gdesklets/utils/x11.so
 lib/gdesklets/utils/xdr.py
 lib/gdesklets/utils/xdr.pyc
 lib/gdesklets/utils/xdr.pyo
-share/gnome/applications/gdesklets.desktop
-share/gnome/pixmaps/gdesklets.png
-@exec mkdir -p %D/share/gnome/gdesklets/Displays
-@exec mkdir -p %D/share/gnome/gdesklets/Sensors
+share/applications/gdesklets.desktop
+share/pixmaps/gdesklets.png
+@exec mkdir -p %D/share/gdesklets/Displays
+@exec mkdir -p %D/share/gdesklets/Sensors
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gdesklets-display.png
 share/locale/ar/LC_MESSAGES/gdesklets.mo
 share/locale/az/LC_MESSAGES/gdesklets.mo
@@ -603,9 +603,9 @@ share/locale/gl/LC_MESSAGES/gdesklets.mo
 share/locale/zh_HK/LC_MESSAGES/gdesklets.mo
 share/mime/application/x-gdesklets-display.xml
 share/mime/packages/gdesklets.xml
-@dirrm share/gnome/gdesklets/Sensors
-@dirrm share/gnome/gdesklets/Displays
-@dirrm share/gnome/gdesklets
+@dirrm share/gdesklets/Sensors
+@dirrm share/gdesklets/Displays
+@dirrm share/gdesklets
 @dirrm lib/gdesklets/utils
 @dirrm lib/gdesklets/shell/plugins/gDeskletsClient
 @dirrm lib/gdesklets/shell/plugins/ViewSwitch
@@ -654,8 +654,9 @@ share/mime/packages/gdesklets.xml
 @dirrm lib/gdesklets
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
 @dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrmtry share/applications
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 5d30fb984030..06fc29bf23b8 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	genius
 PORTVERSION=	0.7.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://ftp.5z.com/pub/genius/
diff --git a/deskutils/genius/pkg-plist b/deskutils/genius/pkg-plist
index 5451f755b132..986760314b8a 100644
--- a/deskutils/genius/pkg-plist
+++ b/deskutils/genius/pkg-plist
@@ -18,53 +18,53 @@ lib/genius/libtestplugin.a
 lib/genius/libtestplugin.la
 lib/genius/libtestplugin.so
 libexec/genius-readline-helper-fifo
-share/gnome/application-registry/genius.applications
-share/gnome/applications/gnome-genius.desktop
-share/gnome/genius/gel/calculus/differentiation.gel
-share/gnome/genius/gel/calculus/integration.gel
-share/gnome/genius/gel/calculus/limits.gel
-share/gnome/genius/gel/calculus/loader.gel
-share/gnome/genius/gel/calculus/sums_products.gel
-share/gnome/genius/gel/combinatorics/factorial.gel
-share/gnome/genius/gel/combinatorics/loader.gel
-share/gnome/genius/gel/combinatorics/misc.gel
-share/gnome/genius/gel/combinatorics/recursive_sequences.gel
-share/gnome/genius/gel/equation_solving/diffeqs.gel
-share/gnome/genius/gel/equation_solving/find_root.gel
-share/gnome/genius/gel/equation_solving/formulas.gel
-share/gnome/genius/gel/equation_solving/loader.gel
-share/gnome/genius/gel/functions/complex_numbers.gel
-share/gnome/genius/gel/functions/delta.gel
-share/gnome/genius/gel/functions/elementary.gel
-share/gnome/genius/gel/functions/kernels.gel
-share/gnome/genius/gel/functions/loader.gel
-share/gnome/genius/gel/functions/numerical.gel
-share/gnome/genius/gel/functions/orthogonal_polynomials.gel
-share/gnome/genius/gel/lib.cgel
-share/gnome/genius/gel/linear_algebra/bilinear_forms.gel
-share/gnome/genius/gel/linear_algebra/linear_algebra.gel
-share/gnome/genius/gel/linear_algebra/loader.gel
-share/gnome/genius/gel/linear_algebra/misc.gel
-share/gnome/genius/gel/linear_algebra/special_matrices.gel
-share/gnome/genius/gel/linear_algebra/subspaces.gel
-share/gnome/genius/gel/loader.gel
-share/gnome/genius/gel/misc/loader.gel
-share/gnome/genius/gel/misc/misc.gel
-share/gnome/genius/gel/number_theory/factoring.gel
-share/gnome/genius/gel/number_theory/loader.gel
-share/gnome/genius/gel/number_theory/misc.gel
-share/gnome/genius/gel/number_theory/modulus.gel
-share/gnome/genius/gel/number_theory/primes.gel
-share/gnome/genius/gel/number_theory/quadratic.gel
-share/gnome/genius/gel/sets/basic.gel
-share/gnome/genius/gel/sets/loader.gel
-share/gnome/genius/gel/statistics/basic.gel
-share/gnome/genius/gel/statistics/loader.gel
-share/gnome/genius/gel/symbolic/differentiation.gel
-share/gnome/genius/gel/symbolic/loader.gel
-share/gnome/genius/genius.txt
-share/gnome/genius/gtksourceview/genius.lang
-share/gnome/genius/plugins/test.plugin
+share/application-registry/genius.applications
+share/applications/gnome-genius.desktop
+share/genius/gel/calculus/differentiation.gel
+share/genius/gel/calculus/integration.gel
+share/genius/gel/calculus/limits.gel
+share/genius/gel/calculus/loader.gel
+share/genius/gel/calculus/sums_products.gel
+share/genius/gel/combinatorics/factorial.gel
+share/genius/gel/combinatorics/loader.gel
+share/genius/gel/combinatorics/misc.gel
+share/genius/gel/combinatorics/recursive_sequences.gel
+share/genius/gel/equation_solving/diffeqs.gel
+share/genius/gel/equation_solving/find_root.gel
+share/genius/gel/equation_solving/formulas.gel
+share/genius/gel/equation_solving/loader.gel
+share/genius/gel/functions/complex_numbers.gel
+share/genius/gel/functions/delta.gel
+share/genius/gel/functions/elementary.gel
+share/genius/gel/functions/kernels.gel
+share/genius/gel/functions/loader.gel
+share/genius/gel/functions/numerical.gel
+share/genius/gel/functions/orthogonal_polynomials.gel
+share/genius/gel/lib.cgel
+share/genius/gel/linear_algebra/bilinear_forms.gel
+share/genius/gel/linear_algebra/linear_algebra.gel
+share/genius/gel/linear_algebra/loader.gel
+share/genius/gel/linear_algebra/misc.gel
+share/genius/gel/linear_algebra/special_matrices.gel
+share/genius/gel/linear_algebra/subspaces.gel
+share/genius/gel/loader.gel
+share/genius/gel/misc/loader.gel
+share/genius/gel/misc/misc.gel
+share/genius/gel/number_theory/factoring.gel
+share/genius/gel/number_theory/loader.gel
+share/genius/gel/number_theory/misc.gel
+share/genius/gel/number_theory/modulus.gel
+share/genius/gel/number_theory/primes.gel
+share/genius/gel/number_theory/quadratic.gel
+share/genius/gel/sets/basic.gel
+share/genius/gel/sets/loader.gel
+share/genius/gel/statistics/basic.gel
+share/genius/gel/statistics/loader.gel
+share/genius/gel/symbolic/differentiation.gel
+share/genius/gel/symbolic/loader.gel
+share/genius/genius.txt
+share/genius/gtksourceview/genius.lang
+share/genius/plugins/test.plugin
 share/gnome/help/genius/C/about.xml
 share/gnome/help/genius/C/examples.xml
 share/gnome/help/genius/C/figures/genius_window.png
@@ -107,9 +107,9 @@ share/gnome/help/genius/C/starting-when-start.xml
 share/gnome/help/genius/C/usage-create-program.xml
 share/gnome/help/genius/C/usage-open-program.xml
 share/gnome/help/genius/C/usage-workarea.xml
-share/gnome/mime-info/genius.keys
-share/gnome/mime-info/genius.mime
-share/gnome/omf/genius/genius-C.omf
+share/mime-info/genius.keys
+share/mime-info/genius.mime
+share/omf/genius/genius-C.omf
 share/icons/hicolor/32x32/apps/gnome-genius.png
 share/icons/hicolor/48x48/apps/gnome-genius.png
 share/locale/ar/LC_MESSAGES/genius.mo
@@ -143,25 +143,26 @@ share/locale/sr@Latn/LC_MESSAGES/genius.mo
 share/locale/sv/LC_MESSAGES/genius.mo
 share/locale/zh_CN/LC_MESSAGES/genius.mo
 share/locale/zh_TW/LC_MESSAGES/genius.mo
-@dirrm share/gnome/omf/genius
+@dirrm share/omf/genius
 @dirrm share/gnome/help/genius/C/figures
 @dirrm share/gnome/help/genius/C
 @dirrm share/gnome/help/genius
-@dirrm share/gnome/genius/gtksourceview
-@dirrm share/gnome/genius/plugins
-@dirrm share/gnome/genius/gel/symbolic
-@dirrm share/gnome/genius/gel/statistics
-@dirrm share/gnome/genius/gel/sets
-@dirrm share/gnome/genius/gel/number_theory
-@dirrm share/gnome/genius/gel/misc
-@dirrm share/gnome/genius/gel/linear_algebra
-@dirrm share/gnome/genius/gel/functions
-@dirrm share/gnome/genius/gel/equation_solving
-@dirrm share/gnome/genius/gel/combinatorics
-@dirrm share/gnome/genius/gel/calculus
-@dirrm share/gnome/genius/gel
-@dirrm share/gnome/genius
+@dirrm share/genius/gtksourceview
+@dirrm share/genius/plugins
+@dirrm share/genius/gel/symbolic
+@dirrm share/genius/gel/statistics
+@dirrm share/genius/gel/sets
+@dirrm share/genius/gel/number_theory
+@dirrm share/genius/gel/misc
+@dirrm share/genius/gel/linear_algebra
+@dirrm share/genius/gel/functions
+@dirrm share/genius/gel/equation_solving
+@dirrm share/genius/gel/combinatorics
+@dirrm share/genius/gel/calculus
+@dirrm share/genius/gel
+@dirrm share/genius
 @dirrm lib/genius
 @dirrm include/genius
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/deskutils/gimmie/Makefile b/deskutils/gimmie/Makefile
index ec9113515f6c..e521387c7251 100644
--- a/deskutils/gimmie/Makefile
+++ b/deskutils/gimmie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gimmie
 PORTVERSION=	0.2.7
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.beatniksoftware.com/gimmie/releases/ \
 		LOCAL/beech
diff --git a/deskutils/gimmie/pkg-plist b/deskutils/gimmie/pkg-plist
index 188ba263ac8e..4cae66cf8abd 100644
--- a/deskutils/gimmie/pkg-plist
+++ b/deskutils/gimmie/pkg-plist
@@ -118,8 +118,8 @@ libexec/gimmie_applet
 share/icons/hicolor/32x32/apps/gimmie.png
 share/icons/hicolor/48x48/apps/gimmie.png
 share/icons/hicolor/scalable/apps/gimmie.svg
-share/gnome/gnome-2.0/ui/GNOME_GimmieApplet.xml
-share/gnome/pixmaps/gimmie.png
+share/gnome-2.0/ui/GNOME_GimmieApplet.xml
+share/pixmaps/gimmie.png
 @dirrm %%PYTHON_SITELIBDIR%%/gimmie/traymanager
 @dirrm %%PYTHON_SITELIBDIR%%/gimmie/sexy
 @dirrm %%PYTHON_SITELIBDIR%%/gimmie/iconentry
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 57d534dafc15..ca82486cab28 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
+#   $MCom: ports/deskutils/glabels/Makefile,v 1.7 2007/05/19 21:36:02 marcus Exp $
 #
 
 PORTNAME=	glabels
 PORTVERSION=	2.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/glabels/pkg-plist b/deskutils/glabels/pkg-plist
index 82736e63aa12..176e12808560 100644
--- a/deskutils/glabels/pkg-plist
+++ b/deskutils/glabels/pkg-plist
@@ -10,22 +10,22 @@ lib/libglabels.a
 lib/libglabels.la
 lib/libglabels.so
 lib/libglabels.so.1
-share/gnome/application-registry/glabels.applications
+share/application-registry/glabels.applications
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/applications/glabels.desktop
-share/gnome/glabels/dtd/glabels-2.0.dtd
-share/gnome/glabels/glade/object-editor.glade
-share/gnome/glabels/glade/prefs-dialog.glade
-share/gnome/glabels/glade/template-designer.glade
-share/gnome/glabels/templates/avery-iso-templates.xml
-share/gnome/glabels/templates/avery-other-templates.xml
-share/gnome/glabels/templates/avery-us-templates.xml
-share/gnome/glabels/templates/misc-iso-templates.xml
-share/gnome/glabels/templates/misc-other-templates.xml
-share/gnome/glabels/templates/misc-us-templates.xml
-share/gnome/glabels/templates/paper-sizes.xml
-share/gnome/glabels/templates/zweckform-iso-templates.xml
-share/gnome/glabels/ui/glabels-ui.xml
+share/applications/glabels.desktop
+share/glabels/dtd/glabels-2.0.dtd
+share/glabels/glade/object-editor.glade
+share/glabels/glade/prefs-dialog.glade
+share/glabels/glade/template-designer.glade
+share/glabels/templates/avery-iso-templates.xml
+share/glabels/templates/avery-other-templates.xml
+share/glabels/templates/avery-us-templates.xml
+share/glabels/templates/misc-iso-templates.xml
+share/glabels/templates/misc-other-templates.xml
+share/glabels/templates/misc-us-templates.xml
+share/glabels/templates/paper-sizes.xml
+share/glabels/templates/zweckform-iso-templates.xml
+share/glabels/ui/glabels-ui.xml
 share/gnome/help/glabels/C/figures/glabels-template-cd.png
 share/gnome/help/glabels/C/figures/glabels-template-label.png
 share/gnome/help/glabels/C/figures/glabels-template-layout.png
@@ -43,18 +43,18 @@ share/gnome/help/glabels/C/figures/print-copies.png
 share/gnome/help/glabels/C/figures/print-merge.png
 share/gnome/help/glabels/C/glabels.xml
 share/gnome/help/glabels/C/legal.xml
-share/gnome/mime-info/glabels.keys
-share/gnome/mime-info/glabels.mime
-share/gnome/omf/glabels/glabels-C.omf
-share/gnome/pixmaps/glabels/ex-1layout.png
-share/gnome/pixmaps/glabels/ex-2layouts.png
-share/gnome/pixmaps/glabels/ex-cd-size.png
-share/gnome/pixmaps/glabels/ex-rect-size.png
-share/gnome/pixmaps/glabels/ex-round-size.png
-share/gnome/pixmaps/glabels/glabels-about-logo.png
-share/gnome/pixmaps/glabels/glabels-splash.png
-share/gnome/pixmaps/glabels-application-x-glabels.png
-share/gnome/pixmaps/glabels.png
+share/mime-info/glabels.keys
+share/mime-info/glabels.mime
+share/omf/glabels/glabels-C.omf
+share/pixmaps/glabels/ex-1layout.png
+share/pixmaps/glabels/ex-2layouts.png
+share/pixmaps/glabels/ex-cd-size.png
+share/pixmaps/glabels/ex-rect-size.png
+share/pixmaps/glabels/ex-round-size.png
+share/pixmaps/glabels/glabels-about-logo.png
+share/pixmaps/glabels/glabels-splash.png
+share/pixmaps/glabels-application-x-glabels.png
+share/pixmaps/glabels.png
 share/locale/cs/LC_MESSAGES/glabels.mo
 share/locale/de/LC_MESSAGES/glabels.mo
 share/locale/es/LC_MESSAGES/glabels.mo
@@ -67,17 +67,18 @@ share/locale/ru/LC_MESSAGES/glabels.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/glabels.mo
 share/mime/application/x-glabels.xml
 share/mime/packages/glabels.xml
-@dirrm share/gnome/pixmaps/glabels
-@dirrm share/gnome/omf/glabels
+@dirrm share/pixmaps/glabels
+@dirrm share/omf/glabels
 @dirrm share/gnome/help/glabels/C/figures
 @dirrm share/gnome/help/glabels/C
 @dirrm share/gnome/help/glabels
-@dirrm share/gnome/glabels/ui
-@dirrm share/gnome/glabels/templates
-@dirrm share/gnome/glabels/glade
-@dirrm share/gnome/glabels/dtd
-@dirrm share/gnome/glabels
+@dirrm share/glabels/ui
+@dirrm share/glabels/templates
+@dirrm share/glabels/glade
+@dirrm share/glabels/dtd
+@dirrm share/glabels
 @dirrm include/libglabels
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/applications
diff --git a/deskutils/gnochm/Makefile b/deskutils/gnochm/Makefile
index 3a5320a40c04..6e9b3bdbdf2f 100644
--- a/deskutils/gnochm/Makefile
+++ b/deskutils/gnochm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnochm
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	deskutils python gnome
 MASTER_SITES=	SF
 
@@ -29,7 +30,6 @@ GCONF_SCHEMAS=	gnochm.schemas
 INSTALLS_OMF=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|@APPDATADIR@|@APPDATADIR@/gnome|' ${WRKSRC}/gnochm.py.in
 	@${REINPLACE_CMD} -e 's|$(prefix)/share/man|$(prefix)/man|' ${WRKSRC}/data/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnochm/pkg-plist b/deskutils/gnochm/pkg-plist
index dfce2568d442..4deba9111441 100644
--- a/deskutils/gnochm/pkg-plist
+++ b/deskutils/gnochm/pkg-plist
@@ -1,16 +1,16 @@
 bin/gnochm
-share/gnome/application-registry/gnochm.applications
-share/gnome/applications/gnochm.desktop
-share/gnome/gnochm/glade/gnochm.glade
-share/gnome/gnochm/glade/prefdialog.glade
+share/application-registry/gnochm.applications
+share/applications/gnochm.desktop
+share/gnochm/glade/gnochm.glade
+share/gnochm/glade/prefdialog.glade
 share/gnome/help/gnochm/C/gnochm.xml
 share/gnome/help/gnochm/C/legal.xml
-share/gnome/mime-info/gnochm.keys
-share/gnome/mime-info/gnochm.mime
-share/gnome/omf/gnochm/gnochm-C.omf
-share/gnome/pixmaps/chmfile.png
-share/gnome/pixmaps/gnochm.png
-share/gnome/pixmaps/gnochm_logo.png
+share/mime-info/gnochm.keys
+share/mime-info/gnochm.mime
+share/omf/gnochm/gnochm-C.omf
+share/pixmaps/chmfile.png
+share/pixmaps/gnochm.png
+share/pixmaps/gnochm_logo.png
 share/locale/be/LC_MESSAGES/gnochm.mo
 share/locale/cs/LC_MESSAGES/gnochm.mo
 share/locale/de/LC_MESSAGES/gnochm.mo
@@ -30,12 +30,13 @@ share/locale/zh_CN/LC_MESSAGES/gnochm.mo
 share/locale/zh_TW/LC_MESSAGES/gnochm.mo
 share/mime/application/x-chm.xml
 share/mime/packages/gnochm.xml
-@dirrm share/gnome/omf/gnochm
+@dirrm share/omf/gnochm
 @dirrm share/gnome/help/gnochm/C
 @dirrm share/gnome/help/gnochm
-@dirrm share/gnome/gnochm/glade
-@dirrm share/gnome/gnochm
+@dirrm share/gnochm/glade
+@dirrm share/gnochm
 @dirrmtry man/it/man1
 @dirrmtry man/it
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index f7c9d545acb3..737123c27c09 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -3,10 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/deskutils/gnome-blog/Makefile,v 1.5 2007/08/08 21:52:36 mezz Exp $
 #
 
 PORTNAME=	gnome-blog
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/deskutils/gnome-blog/pkg-plist b/deskutils/gnome-blog/pkg-plist
index aa7d78c3e8b0..806b903e2450 100644
--- a/deskutils/gnome-blog/pkg-plist
+++ b/deskutils/gnome-blog/pkg-plist
@@ -50,9 +50,8 @@ bin/gnome-blog-poster
 %%PYTHON_SITELIBDIR%%/gnomeblog/rich_entry.pyo
 libdata/bonobo/servers/GNOME_BlogApplet.server
 libexec/blog_applet.py
-share/gnome/applications/gnome-blog.desktop
-share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
-share/gnome/pixmaps/gnome-blog.png
+share/applications/gnome-blog.desktop
+share/gnome-2.0/ui/GNOME_BlogApplet.xml
 share/locale/az/LC_MESSAGES/gnome-blog.mo
 share/locale/bg/LC_MESSAGES/gnome-blog.mo
 share/locale/ca/LC_MESSAGES/gnome-blog.mo
@@ -85,6 +84,8 @@ share/locale/uk/LC_MESSAGES/gnome-blog.mo
 share/locale/vi/LC_MESSAGES/gnome-blog.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-blog.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-blog.mo
+share/pixmaps/gnome-blog.png
+@dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
+@dirrmtry share/applications
diff --git a/deskutils/gnome-menu-editor/Makefile b/deskutils/gnome-menu-editor/Makefile
index 90213f25afd3..bea0fd42c86d 100644
--- a/deskutils/gnome-menu-editor/Makefile
+++ b/deskutils/gnome-menu-editor/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-menu-editor/Makefile,v 1.11 2006/09/01 20:29:54 ahze Exp $
+#   $MCom: ports/deskutils/gnome-menu-editor/Makefile,v 1.13 2007/07/23 20:25:55 mezz Exp $
 #
 
 PORTNAME=	gnome-menu-editor
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://manny.cluecoder.org/packages/gnome-menu-editor/
 
diff --git a/deskutils/gnome-menu-editor/pkg-plist b/deskutils/gnome-menu-editor/pkg-plist
index d414b408d7ba..4450fd91a25c 100644
--- a/deskutils/gnome-menu-editor/pkg-plist
+++ b/deskutils/gnome-menu-editor/pkg-plist
@@ -1,6 +1,6 @@
 bin/gmenu-simple-editor
 bin/gnome-menu-editor
-share/gnome/applications/gnome-menu-editor.desktop
+share/applications/gnome-menu-editor.desktop
 share/locale/bg/LC_MESSAGES/gnome-menu-editor.mo
 share/locale/ca/LC_MESSAGES/gnome-menu-editor.mo
 share/locale/cs/LC_MESSAGES/gnome-menu-editor.mo
@@ -31,3 +31,4 @@ share/locale/zh_CN/LC_MESSAGES/gnome-menu-editor.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-menu-editor.mo
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 8dc6bc2f1bfa..49d5e6398035 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-pim
 PORTVERSION=	1.4.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.jroger.in-berlin.de/gnome-pim/
 DIST_SUBDIR=	gnome
diff --git a/deskutils/gnome-pim/files/patch-ab b/deskutils/gnome-pim/files/patch-ab
index 24ba3da002b9..e27b3092bccd 100644
--- a/deskutils/gnome-pim/files/patch-ab
+++ b/deskutils/gnome-pim/files/patch-ab
@@ -7,8 +7,8 @@ $FreeBSD$
  gnorbadir = $(sysconfdir)/CORBA/servers
  gnorba_DATA = gnomecal.gnorba
  
--help_base = $(datadir)/help/cal
-+help_base = $(datadir)/help/gnomecal
+-help_base = $(datadir)/gnome/help/cal
++help_base = $(datadir)/gnome/help/gnomecal
  
  bin_PROGRAMS = gnomecal
  
diff --git a/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index c5193da467ec..f975b875df30 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -25,11 +25,8 @@ share/gnome/help/gnomecard/C/x36.html
 share/gnome/help/gnomecard/C/x39.html
 share/gnome/help/gnomecard/C/x81.html
 share/gnome/help/gnomecard/C/x84.html
-share/gnome/idl/GnomeCal.idl
-share/gnome/idl/gnome-pim.idl
-share/gnome/mime-info/gnome-pim.keys
-share/gnome/pixmaps/gnome-calendar-conduit.png
-share/gnome/pixmaps/gnome-gnomecard.png
+share/idl/GnomeCal.idl
+share/idl/gnome-pim.idl
 share/locale/az/LC_MESSAGES/gnome-pim.mo
 share/locale/ca/LC_MESSAGES/gnome-pim.mo
 share/locale/cs/LC_MESSAGES/gnome-pim.mo
@@ -69,15 +66,18 @@ share/locale/vi/LC_MESSAGES/gnome-pim.mo
 share/locale/wa/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
-@dirrmtry share/locale/gd/LC_MESSAGES
-@dirrmtry share/locale/gd
-@dirrmtry share/locale/gv/LC_MESSAGES
-@dirrmtry share/locale/gv
-@dirrmtry share/locale/kw/LC_MESSAGES
-@dirrmtry share/locale/kw
+share/mime-info/gnome-pim.keys
+share/pixmaps/gnome-calendar-conduit.png
+share/pixmaps/gnome-gnomecard.png
 @dirrm share/gnome/help/gnomecard/eu
 @dirrm share/gnome/help/gnomecard/C
 @dirrm share/gnome/help/gnomecard
 @dirrm share/gnome/help/gnomecal/C/images
 @dirrm share/gnome/help/gnomecal/C
 @dirrm share/gnome/help/gnomecal
+@dirrmtry share/locale/kw/LC_MESSAGES
+@dirrmtry share/locale/kw
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
+@dirrmtry share/locale/gd/LC_MESSAGES
+@dirrmtry share/locale/gd
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index b934e0e2e860..ab15858fda36 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.115 2007/03/11 20:46:37 mezz Exp $
+#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.125 2007/09/18 14:57:01 ahze Exp $
 #
 
 PORTNAME=	gnome-utils
-PORTVERSION=	2.18.1
-PORTREVISION=	1
+PORTVERSION=	2.20.0.1
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 8a308d2bb976..22234d1e1533 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.18.1.tar.bz2) = 10e8bd928d099a0d1f70919c8b7b7784
-SHA256 (gnome2/gnome-utils-2.18.1.tar.bz2) = 6ceb22d73d47a819ad08aaed7597d2158168e8af9eba41b93ff6d10d85a250e7
-SIZE (gnome2/gnome-utils-2.18.1.tar.bz2) = 4094695
+MD5 (gnome2/gnome-utils-2.20.0.1.tar.bz2) = 2d4385df2fb566b437b283bd2ce70190
+SHA256 (gnome2/gnome-utils-2.20.0.1.tar.bz2) = af208196c59443938b093a811aca7ca975761b9d0af028f9c2e49e84ddea26b1
+SIZE (gnome2/gnome-utils-2.20.0.1.tar.bz2) = 4592719
diff --git a/deskutils/gnome-utils/files/patch-ai b/deskutils/gnome-utils/files/patch-ai
deleted file mode 100644
index 927a2b461d2f..000000000000
--- a/deskutils/gnome-utils/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmldocs.make.orig	Thu Aug  7 09:56:16 2003
-+++ xmldocs.make	Thu Aug  7 13:55:58 2003
-@@ -36,7 +36,7 @@
- # **********  Begin of section some packagers may need to modify  **********
- # This variable (docdir) specifies where the documents should be installed.
- # This default value should work for most packages.
--docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+docdir = $(datadir)/help/$(docname)/$(lang)
- 
- # **********  You should not have to edit below this line  **********
- xml_files = $(entities) $(docname).xml
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 13ed5f5e2db5..8f49667f7ae0 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -24,12 +24,21 @@ lib/libgdict-1.0.so.5
 libdata/bonobo/servers/GNOME_DictionaryApplet.server
 libdata/pkgconfig/gdict-1.0.pc
 libexec/gnome-dictionary-applet
-share/doc/gdict/gdict-GdictClientContext.html
-share/doc/gdict/gdict-GdictDefbox.html
-share/doc/gdict/gdict-GdictEntry.html
-share/doc/gdict/gdict-GdictSource.html
-share/doc/gdict/gdict-GdictSourceLoader.html
-share/doc/gdict/gdict-gdict-context.html
+share/doc/gdict/GdictClientContext.html
+share/doc/gdict/GdictDatabaseChooser.html
+share/doc/gdict/GdictDefbox.html
+share/doc/gdict/GdictSource.html
+share/doc/gdict/GdictSourceLoader.html
+share/doc/gdict/GdictSpeller.html
+share/doc/gdict/GdictStrategyChooser.html
+share/doc/gdict/ch05.html
+share/doc/gdict/ch06.html
+share/doc/gdict/context-types.html
+share/doc/gdict/context.html
+share/doc/gdict/gdict-Gdict-Utilities.html
+share/doc/gdict/gdict-Gdict-Version-Checking.html
+share/doc/gdict/gdict-GdictContext.html
+share/doc/gdict/gdict-utils.html
 share/doc/gdict/gdict.devhelp
 share/doc/gdict/gdict.devhelp2
 share/doc/gdict/gdict.html
@@ -40,27 +49,26 @@ share/doc/gdict/index.sgml
 share/doc/gdict/introduction.html
 share/doc/gdict/left.png
 share/doc/gdict/right.png
-share/doc/gdict/sources-loader.html
 share/doc/gdict/sources.html
 share/doc/gdict/style.css
 share/doc/gdict/up.png
-share/gnome/applications/baobab.desktop
-share/gnome/applications/gnome-dictionary.desktop
-share/gnome/applications/gnome-screenshot.desktop
-share/gnome/applications/gnome-search-tool.desktop
-share/gnome/applications/gnome-system-log.desktop
-share/gnome/baobab/pixmaps/baobab.glade
-share/gnome/baobab/pixmaps/shot.png
-share/gnome/gdict-1.0/sources/default.desktop
-share/gnome/gdict-1.0/sources/spanish.desktop
-share/gnome/gdict-1.0/sources/thai.desktop
-share/gnome/gnome-2.0/ui/GNOME_DictionaryApplet.xml
-share/gnome/gnome-dictionary/gnome-dictionary-preferences.glade
-share/gnome/gnome-dictionary/gnome-dictionary-ui.xml
-share/gnome/gnome-screenshot/glade/gnome-screenshot.glade
-share/gnome/gnome-system-log/gnome-system-log-actions.db
-share/gnome/gnome-system-log/gnome-system-log-descript.db
-share/gnome/gnome-system-log/gnome-system-log-regexp.db
+share/applications/baobab.desktop
+share/applications/gnome-dictionary.desktop
+share/applications/gnome-screenshot.desktop
+share/applications/gnome-search-tool.desktop
+share/applications/gnome-system-log.desktop
+share/baobab/pixmaps/baobab.glade
+share/baobab/pixmaps/shot.png
+share/gdict-1.0/sources/default.desktop
+share/gdict-1.0/sources/spanish.desktop
+share/gdict-1.0/sources/thai.desktop
+share/gnome-2.0/ui/GNOME_DictionaryApplet.xml
+share/gnome-dictionary/gnome-dictionary-preferences.glade
+share/gnome-dictionary/gnome-dictionary-ui.xml
+share/gnome-screenshot/glade/gnome-screenshot.glade
+share/gnome-system-log/gnome-system-log-actions.db
+share/gnome-system-log/gnome-system-log-descript.db
+share/gnome-system-log/gnome-system-log-regexp.db
 share/gnome/help/baobab/C/baobab.xml
 share/gnome/help/baobab/C/figures/baobab_fullscan.png
 share/gnome/help/baobab/C/figures/baobab_prefs.png
@@ -68,6 +76,12 @@ share/gnome/help/baobab/C/figures/baobab_remote.png
 share/gnome/help/baobab/C/figures/baobab_treemaps.png
 share/gnome/help/baobab/C/figures/baobab_window.png
 share/gnome/help/baobab/C/legal.xml
+share/gnome/help/baobab/ca/baobab.xml
+share/gnome/help/baobab/ca/figures/baobab_fullscan.png
+share/gnome/help/baobab/ca/figures/baobab_prefs.png
+share/gnome/help/baobab/ca/figures/baobab_remote.png
+share/gnome/help/baobab/ca/figures/baobab_treemaps.png
+share/gnome/help/baobab/ca/figures/baobab_window.png
 share/gnome/help/baobab/en_GB/baobab.xml
 share/gnome/help/baobab/en_GB/figures/baobab_fullscan.png
 share/gnome/help/baobab/en_GB/figures/baobab_prefs.png
@@ -86,6 +100,12 @@ share/gnome/help/baobab/fr/figures/baobab_prefs.png
 share/gnome/help/baobab/fr/figures/baobab_remote.png
 share/gnome/help/baobab/fr/figures/baobab_treemaps.png
 share/gnome/help/baobab/fr/figures/baobab_window.png
+share/gnome/help/baobab/oc/baobab.xml
+share/gnome/help/baobab/oc/figures/baobab_fullscan.png
+share/gnome/help/baobab/oc/figures/baobab_prefs.png
+share/gnome/help/baobab/oc/figures/baobab_remote.png
+share/gnome/help/baobab/oc/figures/baobab_treemaps.png
+share/gnome/help/baobab/oc/figures/baobab_window.png
 share/gnome/help/baobab/sv/baobab.xml
 share/gnome/help/baobab/sv/figures/baobab_fullscan.png
 share/gnome/help/baobab/sv/figures/baobab_prefs.png
@@ -108,6 +128,15 @@ share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-print.p
 share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/C/legal.xml
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/ca/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-applet.png
@@ -117,6 +146,15 @@ share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-lookup.png
 share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-preferences-print.png
 share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/el/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/en_GB/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet.png
@@ -174,10 +212,18 @@ share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
 share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/C/legal.xml
+share/gnome/help/gnome-search-tool/ca/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/ca/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/en_GB/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/en_GB/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/fr/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/fr/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/ko/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/ko/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/oc/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/oc/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/ru/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/ru/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png
@@ -187,50 +233,68 @@ share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml
 share/gnome/help/gnome-system-log/C/figures/syslog_window.png
 share/gnome/help/gnome-system-log/C/gnome-system-log.xml
 share/gnome/help/gnome-system-log/C/legal.xml
+share/gnome/help/gnome-system-log/ca/figures/syslog_window.png
+share/gnome/help/gnome-system-log/ca/gnome-system-log.xml
+share/gnome/help/gnome-system-log/en_GB/figures/syslog_window.png
+share/gnome/help/gnome-system-log/en_GB/gnome-system-log.xml
 share/gnome/help/gnome-system-log/es/figures/syslog_window.png
 share/gnome/help/gnome-system-log/es/gnome-system-log.xml
 share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
 share/gnome/help/gnome-system-log/fr/gnome-system-log.xml
 share/gnome/help/gnome-system-log/it/figures/syslog_window.png
 share/gnome/help/gnome-system-log/it/gnome-system-log.xml
+share/gnome/help/gnome-system-log/ko/figures/syslog_window.png
+share/gnome/help/gnome-system-log/ko/gnome-system-log.xml
+share/gnome/help/gnome-system-log/oc/figures/syslog_window.png
+share/gnome/help/gnome-system-log/oc/gnome-system-log.xml
 share/gnome/help/gnome-system-log/ru/figures/syslog_window.png
 share/gnome/help/gnome-system-log/ru/gnome-system-log.xml
 share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
 share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
 share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
 share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
-share/gnome/omf/baobab/baobab-C.omf
-share/gnome/omf/baobab/baobab-en_GB.omf
-share/gnome/omf/baobab/baobab-es.omf
-share/gnome/omf/baobab/baobab-fr.omf
-share/gnome/omf/baobab/baobab-sv.omf
-share/gnome/omf/baobab/baobab-uk.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-el.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-es.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-fr.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-it.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-ru.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-sv.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-uk.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-C.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-es.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-fr.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-ru.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-sv.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-uk.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-C.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-es.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-fr.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-it.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-ru.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-sv.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-uk.omf
-share/gnome/pixmaps/gsearchtool/thumbnail_frame.png
+share/omf/baobab/baobab-C.omf
+share/omf/baobab/baobab-ca.omf
+share/omf/baobab/baobab-en_GB.omf
+share/omf/baobab/baobab-es.omf
+share/omf/baobab/baobab-fr.omf
+share/omf/baobab/baobab-oc.omf
+share/omf/baobab/baobab-sv.omf
+share/omf/baobab/baobab-uk.omf
+share/omf/gnome-dictionary/gnome-dictionary-C.omf
+share/omf/gnome-dictionary/gnome-dictionary-ca.omf
+share/omf/gnome-dictionary/gnome-dictionary-el.omf
+share/omf/gnome-dictionary/gnome-dictionary-en_GB.omf
+share/omf/gnome-dictionary/gnome-dictionary-es.omf
+share/omf/gnome-dictionary/gnome-dictionary-fr.omf
+share/omf/gnome-dictionary/gnome-dictionary-it.omf
+share/omf/gnome-dictionary/gnome-dictionary-ru.omf
+share/omf/gnome-dictionary/gnome-dictionary-sv.omf
+share/omf/gnome-dictionary/gnome-dictionary-uk.omf
+share/omf/gnome-search-tool/gnome-search-tool-C.omf
+share/omf/gnome-search-tool/gnome-search-tool-ca.omf
+share/omf/gnome-search-tool/gnome-search-tool-en_GB.omf
+share/omf/gnome-search-tool/gnome-search-tool-es.omf
+share/omf/gnome-search-tool/gnome-search-tool-ko.omf
+share/omf/gnome-search-tool/gnome-search-tool-oc.omf
+share/omf/gnome-search-tool/gnome-search-tool-fr.omf
+share/omf/gnome-search-tool/gnome-search-tool-ru.omf
+share/omf/gnome-search-tool/gnome-search-tool-sv.omf
+share/omf/gnome-search-tool/gnome-search-tool-uk.omf
+share/omf/gnome-system-log/gnome-system-log-C.omf
+share/omf/gnome-system-log/gnome-system-log-ca.omf
+share/omf/gnome-system-log/gnome-system-log-en_GB.omf
+share/omf/gnome-system-log/gnome-system-log-es.omf
+share/omf/gnome-system-log/gnome-system-log-fr.omf
+share/omf/gnome-system-log/gnome-system-log-it.omf
+share/omf/gnome-system-log/gnome-system-log-ko.omf
+share/omf/gnome-system-log/gnome-system-log-oc.omf
+share/omf/gnome-system-log/gnome-system-log-ru.omf
+share/omf/gnome-system-log/gnome-system-log-sv.omf
+share/omf/gnome-system-log/gnome-system-log-uk.omf
+share/pixmaps/gsearchtool/thumbnail_frame.png
 share/icons/hicolor/24x24/apps/baobab.png
-share/icons/hicolor/48x48/apps/gnome-dictionary.png
 share/icons/hicolor/scalable/apps/baobab.svg
-share/icons/hicolor/scalable/apps/gnome-dictionary.svg
 share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
@@ -278,6 +342,7 @@ share/locale/nb/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-utils-2.0.mo
@@ -286,6 +351,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo
@@ -293,6 +359,7 @@ share/locale/sr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-utils-2.0.mo
@@ -302,23 +369,31 @@ share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-@dirrm share/gnome/pixmaps/gsearchtool
-@dirrm share/gnome/omf/gnome-system-log
-@dirrm share/gnome/omf/gnome-search-tool
-@dirrm share/gnome/omf/gnome-dictionary
-@dirrm share/gnome/omf/baobab
+@dirrm share/pixmaps/gsearchtool
+@dirrm share/omf/gnome-system-log
+@dirrm share/omf/gnome-search-tool
+@dirrm share/omf/gnome-dictionary
+@dirrm share/omf/baobab
 @dirrm share/gnome/help/gnome-system-log/uk/figures
 @dirrm share/gnome/help/gnome-system-log/uk
 @dirrm share/gnome/help/gnome-system-log/sv/figures
 @dirrm share/gnome/help/gnome-system-log/sv
 @dirrm share/gnome/help/gnome-system-log/ru/figures
 @dirrm share/gnome/help/gnome-system-log/ru
+@dirrm share/gnome/help/gnome-system-log/oc/figures
+@dirrm share/gnome/help/gnome-system-log/oc
+@dirrm share/gnome/help/gnome-system-log/ko/figures
+@dirrm share/gnome/help/gnome-system-log/ko
 @dirrm share/gnome/help/gnome-system-log/it/figures
 @dirrm share/gnome/help/gnome-system-log/it
 @dirrm share/gnome/help/gnome-system-log/fr/figures
 @dirrm share/gnome/help/gnome-system-log/fr
 @dirrm share/gnome/help/gnome-system-log/es/figures
 @dirrm share/gnome/help/gnome-system-log/es
+@dirrm share/gnome/help/gnome-system-log/en_GB/figures
+@dirrm share/gnome/help/gnome-system-log/en_GB
+@dirrm share/gnome/help/gnome-system-log/ca/figures
+@dirrm share/gnome/help/gnome-system-log/ca
 @dirrm share/gnome/help/gnome-system-log/C/figures
 @dirrm share/gnome/help/gnome-system-log/C
 @dirrm share/gnome/help/gnome-system-log
@@ -328,10 +403,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-search-tool/sv
 @dirrm share/gnome/help/gnome-search-tool/ru/figures
 @dirrm share/gnome/help/gnome-search-tool/ru
+@dirrm share/gnome/help/gnome-search-tool/oc/figures
+@dirrm share/gnome/help/gnome-search-tool/oc
+@dirrm share/gnome/help/gnome-search-tool/ko/figures
+@dirrm share/gnome/help/gnome-search-tool/ko
 @dirrm share/gnome/help/gnome-search-tool/fr/figures
 @dirrm share/gnome/help/gnome-search-tool/fr
 @dirrm share/gnome/help/gnome-search-tool/es/figures
 @dirrm share/gnome/help/gnome-search-tool/es
+@dirrm share/gnome/help/gnome-search-tool/en_GB/figures
+@dirrm share/gnome/help/gnome-search-tool/en_GB
+@dirrm share/gnome/help/gnome-search-tool/ca/figures
+@dirrm share/gnome/help/gnome-search-tool/ca
 @dirrm share/gnome/help/gnome-search-tool/C/figures
 @dirrm share/gnome/help/gnome-search-tool/C
 @dirrm share/gnome/help/gnome-search-tool
@@ -347,8 +430,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-dictionary/fr
 @dirrm share/gnome/help/gnome-dictionary/es/figures
 @dirrm share/gnome/help/gnome-dictionary/es
+@dirrm share/gnome/help/gnome-dictionary/en_GB/figures
+@dirrm share/gnome/help/gnome-dictionary/en_GB
 @dirrm share/gnome/help/gnome-dictionary/el/figures
 @dirrm share/gnome/help/gnome-dictionary/el
+@dirrm share/gnome/help/gnome-dictionary/ca/figures
+@dirrm share/gnome/help/gnome-dictionary/ca
 @dirrm share/gnome/help/gnome-dictionary/C/figures
 @dirrm share/gnome/help/gnome-dictionary/C
 @dirrm share/gnome/help/gnome-dictionary
@@ -356,23 +443,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/baobab/uk
 @dirrm share/gnome/help/baobab/sv/figures
 @dirrm share/gnome/help/baobab/sv
+@dirrm share/gnome/help/baobab/oc/figures
+@dirrm share/gnome/help/baobab/oc
 @dirrm share/gnome/help/baobab/fr/figures
 @dirrm share/gnome/help/baobab/fr
 @dirrm share/gnome/help/baobab/es/figures
 @dirrm share/gnome/help/baobab/es
 @dirrm share/gnome/help/baobab/en_GB/figures
 @dirrm share/gnome/help/baobab/en_GB
+@dirrm share/gnome/help/baobab/ca/figures
+@dirrm share/gnome/help/baobab/ca
 @dirrm share/gnome/help/baobab/C/figures
 @dirrm share/gnome/help/baobab/C
 @dirrm share/gnome/help/baobab
-@dirrm share/gnome/gnome-system-log
-@dirrm share/gnome/gnome-screenshot/glade
-@dirrm share/gnome/gnome-screenshot
-@dirrm share/gnome/gnome-dictionary
-@dirrm share/gnome/gdict-1.0/sources
-@dirrm share/gnome/gdict-1.0
-@dirrm share/gnome/baobab/pixmaps
-@dirrm share/gnome/baobab
+@dirrm share/gnome-system-log
+@dirrm share/gnome-screenshot/glade
+@dirrm share/gnome-screenshot
+@dirrm share/gnome-dictionary
+@dirrm share/gdict-1.0/sources
+@dirrm share/gdict-1.0
+@dirrm share/baobab/pixmaps
+@dirrm share/baobab
 @dirrm share/doc/gdict
 @dirrm include/gdict-1.0/gdict
 @dirrm include/gdict-1.0
@@ -380,8 +471,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -390,3 +487,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 654e76d130f4..7df1470b483c 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -3,13 +3,12 @@
 # Whom:			Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnotime/Makefile,v 1.18 2007/03/14 17:45:39 marcus Exp $
+#   $MCom: ports/deskutils/gnotime/Makefile,v 1.21 2007/05/19 21:36:03 marcus Exp $
 #
 
 PORTNAME=	gnotime
 PORTVERSION=	2.2.2
-PORTREVISION=	1
-PORTREVISON=	3
+PORTREVISION=	6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gttr
@@ -21,6 +20,7 @@ LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnomeprefix intlhack gtkhtml3 libgnomeui
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
diff --git a/deskutils/gnotime/pkg-plist b/deskutils/gnotime/pkg-plist
index 106729272305..d787bbd16976 100644
--- a/deskutils/gnotime/pkg-plist
+++ b/deskutils/gnotime/pkg-plist
@@ -26,40 +26,40 @@ lib/libqofsql.a
 lib/libqofsql.la
 lib/libqofsql.so
 lib/libqofsql.so.0
-share/gnome/applications/gnotime.desktop
-share/gnome/gnotime/ghtml/C/activity.ghtml
-share/gnome/gnotime/ghtml/C/basic-daily.ghtml
-share/gnome/gnotime/ghtml/C/basic-invoice.ghtml
-share/gnome/gnotime/ghtml/C/basic-journal.ghtml
-share/gnome/gnotime/ghtml/C/basic-todo.ghtml
-share/gnome/gnotime/ghtml/C/daily.ghtml
-share/gnome/gnotime/ghtml/C/gnotime-logo.png
-share/gnome/gnotime/ghtml/C/gtt-style.css
-share/gnome/gnotime/ghtml/C/gtt.scm
-share/gnome/gnotime/ghtml/C/invoice.ghtml
-share/gnome/gnotime/ghtml/C/journal-rss.ghtml
-share/gnome/gnotime/ghtml/C/journal.ghtml
-share/gnome/gnotime/ghtml/C/noproject.ghtml
-share/gnome/gnotime/ghtml/C/primer.ghtml
-share/gnome/gnotime/ghtml/C/query.ghtml
-share/gnome/gnotime/ghtml/C/status.ghtml
-share/gnome/gnotime/ghtml/C/tab-delim.ghtml
-share/gnome/gnotime/ghtml/C/todo-export.ghtml
-share/gnome/gnotime/ghtml/C/todo.ghtml
-share/gnome/gnotime/glade/active.glade
-share/gnome/gnotime/glade/column_menu.glade
-share/gnome/gnotime/glade/idle.glade
-share/gnome/gnotime/glade/interval_edit.glade
-share/gnome/gnotime/glade/interval_popup.glade
-share/gnome/gnotime/glade/journal.glade
-share/gnome/gnotime/glade/not-implemented.glade
-share/gnome/gnotime/glade/notes.glade
-share/gnome/gnotime/glade/plugin.glade
-share/gnome/gnotime/glade/plugin_editor.glade
-share/gnome/gnotime/glade/prefs.glade
-share/gnome/gnotime/glade/project_properties.glade
-share/gnome/gnotime/glade/task_popup.glade
-share/gnome/gnotime/glade/task_properties.glade
+share/applications/gnotime.desktop
+share/gnotime/ghtml/C/activity.ghtml
+share/gnotime/ghtml/C/basic-daily.ghtml
+share/gnotime/ghtml/C/basic-invoice.ghtml
+share/gnotime/ghtml/C/basic-journal.ghtml
+share/gnotime/ghtml/C/basic-todo.ghtml
+share/gnotime/ghtml/C/daily.ghtml
+share/gnotime/ghtml/C/gnotime-logo.png
+share/gnotime/ghtml/C/gtt-style.css
+share/gnotime/ghtml/C/gtt.scm
+share/gnotime/ghtml/C/invoice.ghtml
+share/gnotime/ghtml/C/journal-rss.ghtml
+share/gnotime/ghtml/C/journal.ghtml
+share/gnotime/ghtml/C/noproject.ghtml
+share/gnotime/ghtml/C/primer.ghtml
+share/gnotime/ghtml/C/query.ghtml
+share/gnotime/ghtml/C/status.ghtml
+share/gnotime/ghtml/C/tab-delim.ghtml
+share/gnotime/ghtml/C/todo-export.ghtml
+share/gnotime/ghtml/C/todo.ghtml
+share/gnotime/glade/active.glade
+share/gnotime/glade/column_menu.glade
+share/gnotime/glade/idle.glade
+share/gnotime/glade/interval_edit.glade
+share/gnotime/glade/interval_popup.glade
+share/gnotime/glade/journal.glade
+share/gnotime/glade/not-implemented.glade
+share/gnotime/glade/notes.glade
+share/gnotime/glade/plugin.glade
+share/gnotime/glade/plugin_editor.glade
+share/gnotime/glade/prefs.glade
+share/gnotime/glade/project_properties.glade
+share/gnotime/glade/task_popup.glade
+share/gnotime/glade/task_properties.glade
 share/gnome/help/gnotime/C/figures/gtt_startprojwin.png
 share/gnome/help/gnotime/C/figures/gtt_restartwin.png
 share/gnome/help/gnotime/C/figures/gtt_mainwin.png
@@ -71,9 +71,9 @@ share/gnome/help/gnotime/es/gnotime.xml
 share/gnome/help/gnotime/eu/figures/gtt_mainwin.png
 share/gnome/help/gnotime/eu/figures/gtt_prefswin.png
 share/gnome/help/gnotime/eu/gnotime.xml
-share/gnome/omf/gnotime/gnotime-C.omf
-share/gnome/omf/gnotime/gnotime-es.omf
-share/gnome/omf/gnotime/gnotime-eu.omf
+share/omf/gnotime/gnotime-C.omf
+share/omf/gnotime/gnotime-es.omf
+share/omf/gnotime/gnotime-eu.omf
 share/locale/az/LC_MESSAGES/gnotime-2.0.mo
 share/locale/bg/LC_MESSAGES/gnotime-2.0.mo
 share/locale/ca/LC_MESSAGES/gnotime-2.0.mo
@@ -114,7 +114,7 @@ share/locale/vi/LC_MESSAGES/gnotime-2.0.mo
 share/locale/wa/LC_MESSAGES/gnotime-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnotime-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnotime-2.0.mo
-@dirrm share/gnome/omf/gnotime
+@dirrm share/omf/gnotime
 @dirrm share/gnome/help/gnotime/eu/figures
 @dirrm share/gnome/help/gnotime/eu
 @dirrm share/gnome/help/gnotime/es/figures
@@ -122,8 +122,9 @@ share/locale/zh_TW/LC_MESSAGES/gnotime-2.0.mo
 @dirrm share/gnome/help/gnotime/C/figures
 @dirrm share/gnome/help/gnotime/C
 @dirrm share/gnome/help/gnotime
-@dirrm share/gnome/gnotime/glade
-@dirrm share/gnome/gnotime/ghtml/C
-@dirrm share/gnome/gnotime/ghtml
-@dirrm share/gnome/gnotime
+@dirrm share/gnotime/glade
+@dirrm share/gnotime/ghtml/C
+@dirrm share/gnotime/ghtml
+@dirrm share/gnotime
 @dirrm include/gnotime
+@dirrmtry share/applications
diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile
index 248163716860..afe4274aa250 100644
--- a/deskutils/gruler/Makefile
+++ b/deskutils/gruler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gruler
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://linuxadvocate.org/projects/gruler/downloads/
 
@@ -23,9 +23,5 @@ USE_GCC=	3.4
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=""||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|PACKAGE_DATA_DIR|"${PREFIX}/share/gnome"|' \
-		${WRKSRC}/src/gui.c
-	@${REINPLACE_CMD} -e 's|^\(gruler_pixmapsdir = \).*|\1${PREFIX}/share/gnome/pixmaps|' \
-		${WRKSRC}/pixmaps/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/deskutils/gruler/pkg-plist b/deskutils/gruler/pkg-plist
index d64c60bf448f..bef182ee8ece 100644
--- a/deskutils/gruler/pkg-plist
+++ b/deskutils/gruler/pkg-plist
@@ -1,7 +1,9 @@
 bin/gruler
-share/gnome/applications/gruler.desktop
-share/gnome/gruler/glade/gruler-icon.png
-share/gnome/gruler/glade/gruler.glade
-share/gnome/pixmaps/gruler-icon.png
-@dirrm share/gnome/gruler/glade
-@dirrm share/gnome/gruler
+share/applications/gruler.desktop
+share/gruler/glade/gruler-icon.png
+share/gruler/glade/gruler.glade
+share/pixmaps/gruler/gruler-icon.png
+@dirrm share/pixmaps/gruler
+@dirrm share/gruler/glade
+@dirrm share/gruler
+@dirrmtry share/applications
diff --git a/deskutils/gtodo/Makefile b/deskutils/gtodo/Makefile
index 98505a73c422..cced0855c186 100644
--- a/deskutils/gtodo/Makefile
+++ b/deskutils/gtodo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtodo
 PORTVERSION=	0.14
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtodo
diff --git a/deskutils/gtodo/pkg-plist b/deskutils/gtodo/pkg-plist
index d8924d1eb992..eb5f17b5665e 100644
--- a/deskutils/gtodo/pkg-plist
+++ b/deskutils/gtodo/pkg-plist
@@ -1,9 +1,9 @@
 bin/gtodo
-share/gnome/applications/gtodo.desktop
-share/gnome/pixmaps/gtodo-about.png
-share/gnome/pixmaps/gtodo-edit.png
-share/gnome/pixmaps/gtodo.png
-share/gnome/pixmaps/gtodo_tray.png
+share/applications/gtodo.desktop
+share/pixmaps/gtodo-about.png
+share/pixmaps/gtodo-edit.png
+share/pixmaps/gtodo.png
+share/pixmaps/gtodo_tray.png
 share/locale/cs/LC_MESSAGES/gtodo.mo
 share/locale/de/LC_MESSAGES/gtodo.mo
 share/locale/ja/LC_MESSAGES/gtodo.mo
@@ -11,3 +11,4 @@ share/locale/pl/LC_MESSAGES/gtodo.mo
 share/locale/ru/LC_MESSAGES/gtodo.mo
 share/locale/sr/LC_MESSAGES/gtodo.mo
 share/locale/sr@Latn/LC_MESSAGES/gtodo.mo
+@dirrmtry share/applications
diff --git a/deskutils/gtweakui/Makefile b/deskutils/gtweakui/Makefile
index feef01614106..630517a34e47 100644
--- a/deskutils/gtweakui/Makefile
+++ b/deskutils/gtweakui/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Sergey Akifyev <asa@gascom.ru>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/deskutils/gtweakui/Makefile,v 1.2 2007/05/19 21:36:03 marcus Exp $
 
 PORTNAME=	gTweakUI
 PORTVERSION=	0.4.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtweakui
@@ -29,7 +29,7 @@ DESKTOP_FILES=	gtweakui-galeon.desktop.in \
 
 post-patch:
 .for FILE in ${DESKTOP_FILES}
-	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share/gnome|g' \
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
 			-e 's|Settings;|&AdvancedSettings;|g' ${WRKSRC}/${FILE}
 .endfor
 	@${REINPLACE_CMD} 's|$$(datadir)/applications|$$(datadir)/control-center-2.0/capplets|g' ${WRKSRC}/Makefile.in
diff --git a/deskutils/gtweakui/pkg-plist b/deskutils/gtweakui/pkg-plist
index 6696f33f3143..d7917a68b415 100644
--- a/deskutils/gtweakui/pkg-plist
+++ b/deskutils/gtweakui/pkg-plist
@@ -2,20 +2,20 @@ bin/gtweakui-menus
 bin/gtweakui-session
 bin/gtweakui-nautilus
 bin/gtweakui-galeon
-share/gnome/gTweakUI/g.png
-share/gnome/gTweakUI/menus0.png
-share/gnome/gTweakUI/menus1.png
-share/gnome/gTweakUI/menus2.png
-share/gnome/gTweakUI/menus3.png
-share/gnome/gTweakUI/menus.glade
-share/gnome/gTweakUI/session.glade
-share/gnome/gTweakUI/nautilus.glade
-share/gnome/gTweakUI/galeon.glade
-share/gnome/gTweakUI/about.glade
-share/gnome/gTweakUI/notice.glade
-share/gnome/gTweakUI/bullet.png
-share/gnome/control-center-2.0/capplets/gtweakui-menus.desktop
-share/gnome/control-center-2.0/capplets/gtweakui-session.desktop
-share/gnome/control-center-2.0/capplets/gtweakui-nautilus.desktop
-share/gnome/control-center-2.0/capplets/gtweakui-galeon.desktop
-@dirrm share/gnome/gTweakUI
+share/gTweakUI/g.png
+share/gTweakUI/menus0.png
+share/gTweakUI/menus1.png
+share/gTweakUI/menus2.png
+share/gTweakUI/menus3.png
+share/gTweakUI/menus.glade
+share/gTweakUI/session.glade
+share/gTweakUI/nautilus.glade
+share/gTweakUI/galeon.glade
+share/gTweakUI/about.glade
+share/gTweakUI/notice.glade
+share/gTweakUI/bullet.png
+share/control-center-2.0/capplets/gtweakui-menus.desktop
+share/control-center-2.0/capplets/gtweakui-session.desktop
+share/control-center-2.0/capplets/gtweakui-nautilus.desktop
+share/control-center-2.0/capplets/gtweakui-galeon.desktop
+@dirrm share/gTweakUI
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 0557d068d7fc..877b23656b45 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.35 2007/03/13 00:40:44 mezz Exp $
+#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.41 2007/09/18 12:13:31 ahze Exp $
 #
 
 PORTNAME=	gucharmap
-PORTVERSION=	1.10.0
-PORTREVISION=	1
+PORTVERSION=	1.10.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,8 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A Unicode/ISO10646 character map and font viewer
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+LIB_DEPENDS=	rarian.0:${PORTSDIR}/textproc/rarian
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index e8520ec22c29..3bcd38f10d98 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-1.10.0.tar.bz2) = a0e01bcff2bc5e35ec88f60a383051d3
-SHA256 (gnome2/gucharmap-1.10.0.tar.bz2) = 67efc04e6c70db7a342315a291a49869aff4c262b83233e3e4d1dd654a2d753b
-SIZE (gnome2/gucharmap-1.10.0.tar.bz2) = 2506883
+MD5 (gnome2/gucharmap-1.10.1.tar.bz2) = 2b65ae7bef1b11048e77b287a2051020
+SHA256 (gnome2/gucharmap-1.10.1.tar.bz2) = 0069a72299a68048c06466b68fec2abc3974bcf0b5331bfc56f02f64dca40dc8
+SIZE (gnome2/gucharmap-1.10.1.tar.bz2) = 2561279
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index d6a03d9cd255..d2acb4c48b89 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -17,7 +17,7 @@ lib/libgucharmap.la
 lib/libgucharmap.so
 lib/libgucharmap.so.6
 libdata/pkgconfig/gucharmap.pc
-share/gnome/applications/gucharmap.desktop
+share/applications/gucharmap.desktop
 share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/C/figures/gucharmap_window.png
 share/gnome/help/gucharmap/C/gucharmap.xml
@@ -25,9 +25,9 @@ share/gnome/help/gucharmap/C/legal.xml
 share/gnome/help/gucharmap/bg/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/bg/figures/gucharmap_window.png
 share/gnome/help/gucharmap/bg/gucharmap.xml
+share/gnome/help/gucharmap/de/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/de/figures/gucharmap_window.png
 share/gnome/help/gucharmap/de/gucharmap.xml
-share/gnome/help/gucharmap/de/legal.xml
 share/gnome/help/gucharmap/en_GB/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/en_GB/figures/gucharmap_window.png
 share/gnome/help/gucharmap/en_GB/gucharmap.xml
@@ -49,6 +49,9 @@ share/gnome/help/gucharmap/ja/legal.xml
 share/gnome/help/gucharmap/ko/figures/gucharmap_window.png
 share/gnome/help/gucharmap/ko/gucharmap.xml
 share/gnome/help/gucharmap/ko/legal.xml
+share/gnome/help/gucharmap/oc/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/oc/figures/gucharmap_window.png
+share/gnome/help/gucharmap/oc/gucharmap.xml
 share/gnome/help/gucharmap/ru/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/ru/figures/gucharmap_window.png
 share/gnome/help/gucharmap/ru/gucharmap.xml
@@ -61,20 +64,6 @@ share/gnome/help/gucharmap/zh_CN/legal.xml
 share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
 share/gnome/help/gucharmap/zh_TW/gucharmap.xml
 share/gnome/help/gucharmap/zh_TW/legal.xml
-share/gnome/omf/gucharmap/gucharmap-C.omf
-share/gnome/omf/gucharmap/gucharmap-bg.omf
-share/gnome/omf/gucharmap/gucharmap-de.omf
-share/gnome/omf/gucharmap/gucharmap-en_GB.omf
-share/gnome/omf/gucharmap/gucharmap-es.omf
-share/gnome/omf/gucharmap/gucharmap-fi.omf
-share/gnome/omf/gucharmap/gucharmap-fr.omf
-share/gnome/omf/gucharmap/gucharmap-it.omf
-share/gnome/omf/gucharmap/gucharmap-ja.omf
-share/gnome/omf/gucharmap/gucharmap-ko.omf
-share/gnome/omf/gucharmap/gucharmap-ru.omf
-share/gnome/omf/gucharmap/gucharmap-sv.omf
-share/gnome/omf/gucharmap/gucharmap-zh_CN.omf
-share/gnome/omf/gucharmap/gucharmap-zh_TW.omf
 share/icons/hicolor/48x48/apps/gucharmap.png
 share/locale/am/LC_MESSAGES/gucharmap.mo
 share/locale/ar/LC_MESSAGES/gucharmap.mo
@@ -124,6 +113,7 @@ share/locale/nb/LC_MESSAGES/gucharmap.mo
 share/locale/ne/LC_MESSAGES/gucharmap.mo
 share/locale/nl/LC_MESSAGES/gucharmap.mo
 share/locale/nn/LC_MESSAGES/gucharmap.mo
+share/locale/oc/LC_MESSAGES/gucharmap.mo
 share/locale/or/LC_MESSAGES/gucharmap.mo
 share/locale/pa/LC_MESSAGES/gucharmap.mo
 share/locale/pl/LC_MESSAGES/gucharmap.mo
@@ -132,6 +122,7 @@ share/locale/pt_BR/LC_MESSAGES/gucharmap.mo
 share/locale/ro/LC_MESSAGES/gucharmap.mo
 share/locale/ru/LC_MESSAGES/gucharmap.mo
 share/locale/rw/LC_MESSAGES/gucharmap.mo
+share/locale/si/LC_MESSAGES/gucharmap.mo
 share/locale/sk/LC_MESSAGES/gucharmap.mo
 share/locale/sl/LC_MESSAGES/gucharmap.mo
 share/locale/sq/LC_MESSAGES/gucharmap.mo
@@ -148,7 +139,22 @@ share/locale/xh/LC_MESSAGES/gucharmap.mo
 share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
 share/locale/zh_HK/LC_MESSAGES/gucharmap.mo
 share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
-@dirrm share/gnome/omf/gucharmap
+share/omf/gucharmap/gucharmap-C.omf
+share/omf/gucharmap/gucharmap-bg.omf
+share/omf/gucharmap/gucharmap-de.omf
+share/omf/gucharmap/gucharmap-en_GB.omf
+share/omf/gucharmap/gucharmap-es.omf
+share/omf/gucharmap/gucharmap-fi.omf
+share/omf/gucharmap/gucharmap-fr.omf
+share/omf/gucharmap/gucharmap-it.omf
+share/omf/gucharmap/gucharmap-ja.omf
+share/omf/gucharmap/gucharmap-ko.omf
+share/omf/gucharmap/gucharmap-oc.omf
+share/omf/gucharmap/gucharmap-ru.omf
+share/omf/gucharmap/gucharmap-sv.omf
+share/omf/gucharmap/gucharmap-zh_CN.omf
+share/omf/gucharmap/gucharmap-zh_TW.omf
+@dirrm share/omf/gucharmap
 @dirrm share/gnome/help/gucharmap/zh_TW/figures
 @dirrm share/gnome/help/gucharmap/zh_TW
 @dirrm share/gnome/help/gucharmap/zh_CN/figures
@@ -157,6 +163,8 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrm share/gnome/help/gucharmap/sv
 @dirrm share/gnome/help/gucharmap/ru/figures
 @dirrm share/gnome/help/gucharmap/ru
+@dirrm share/gnome/help/gucharmap/oc/figures
+@dirrm share/gnome/help/gucharmap/oc
 @dirrm share/gnome/help/gucharmap/ko/figures
 @dirrm share/gnome/help/gucharmap/ko
 @dirrm share/gnome/help/gucharmap/ja/figures
@@ -183,8 +191,12 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
@@ -193,3 +205,4 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/deskutils/gxmessage/Makefile b/deskutils/gxmessage/Makefile
index 296ba7095079..6d1843846a3f 100644
--- a/deskutils/gxmessage/Makefile
+++ b/deskutils/gxmessage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxmessage
 PORTVERSION=	2.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	http://homepages.ihug.co.nz/~trmusson/stuff/
 
@@ -24,6 +24,6 @@ MAKE_ARGS+=	INSTALL="${INSTALL_PROGRAM}"
 MANCOMPRESSED=	no
 MAN1=		gxmessage.1
 PLIST_FILES=	bin/gxmessage \
-		share/gnome/pixmaps/gxmessage.png
+		share/pixmaps/gxmessage.png
 
 .include <bsd.port.mk>
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index a77b082fba36..26d29efa58d6 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	logjam
 PORTVERSION=	4.5.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://logjam.danga.com/download/
 
diff --git a/deskutils/logjam/pkg-plist b/deskutils/logjam/pkg-plist
index a3e4100cfe73..1cc92465214f 100644
--- a/deskutils/logjam/pkg-plist
+++ b/deskutils/logjam/pkg-plist
@@ -1,8 +1,8 @@
 bin/logjam
 %%WITH_XMMS%%bin/logjam-xmms-client
-share/gnome/applications/logjam.desktop
-share/gnome/pixmaps/logjam_goat.png
-share/gnome/pixmaps/logjam_pencil.png
+share/applications/logjam.desktop
+share/pixmaps/logjam_goat.png
+share/pixmaps/logjam_pencil.png
 share/locale/de/LC_MESSAGES/logjam.mo
 share/locale/en_GB/LC_MESSAGES/logjam.mo
 share/locale/en_US.UTF-8/LC_MESSAGES/logjam.mo
@@ -17,3 +17,4 @@ share/locale/ja/LC_MESSAGES/logjam.mo
 @dirrmtry share/locale/ru_RU
 @dirrmtry share/locale/uk_UA/LC_MESSAGES
 @dirrmtry share/locale/uk_UA
+@dirrmtry share/applications
diff --git a/deskutils/mcatalog/Makefile b/deskutils/mcatalog/Makefile
index 53a4ccdd625f..9bb9c6896c1f 100644
--- a/deskutils/mcatalog/Makefile
+++ b/deskutils/mcatalog/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mcatalog
 PORTVERSION=	0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.mcatalog.net/releases/
 
@@ -35,8 +35,6 @@ GCONF_SCHEMAS=	mcatalog.schemas
 post-patch:
 	@${REINPLACE_CMD} -e 's|/pixmaps/mcatalog|/pixmaps|g' \
 		${WRKSRC}/images/Makefile.in
-	@${REINPLACE_CMD} -e 's|@prefix@/share|${PREFIX}/share/gnome|g' \
-		${WRKSRC}/mcatalog.desktop.in
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${LOCALBASE}/lib/${GECKO}|g' \
 		${WRKSRC}/src/mcatalog.in
 
diff --git a/deskutils/mcatalog/files/patch-src::Defines.cs.in b/deskutils/mcatalog/files/patch-src::Defines.cs.in
deleted file mode 100644
index ce9beac641fa..000000000000
--- a/deskutils/mcatalog/files/patch-src::Defines.cs.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Defines.cs.in.orig	Sun Aug  7 13:40:06 2005
-+++ src/Defines.cs.in	Sun Aug  7 13:40:44 2005
-@@ -9,9 +9,9 @@
- 
- public class Defines {
- 	public static string VERSION = "@version@";
--	public static string DATADIR = "@prefix@/share";
-+	public static string DATADIR = "@prefix@/share/gnome";
- 	public static string APP_DATADIR = DATADIR + "/mcatalog";
- 	public static string IMAGE_DATADIR = APP_DATADIR + "/pixmaps";
- 	public static string TEMPLATES_DATADIR = APP_DATADIR + "/templates";
--	public static string GNOME_LOCALE_DIR = DATADIR + "/locale";
-+	public static string GNOME_LOCALE_DIR = "@prefix@/share/locale";
- }
diff --git a/deskutils/mcatalog/pkg-plist b/deskutils/mcatalog/pkg-plist
index 7c15a2b84c46..5611a63e6560 100644
--- a/deskutils/mcatalog/pkg-plist
+++ b/deskutils/mcatalog/pkg-plist
@@ -6,43 +6,43 @@ lib/mcatalog/mcatalog.exe
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/application-registry/mcatalog.applications
-share/gnome/applications/mcatalog.desktop
-share/gnome/mcatalog/pixmaps/bigstar.png
-share/gnome/mcatalog/pixmaps/borrowed.png
-share/gnome/mcatalog/pixmaps/default/background.jpg
-share/gnome/mcatalog/pixmaps/default/shelf.png
-share/gnome/mcatalog/pixmaps/grass/background.jpg
-share/gnome/mcatalog/pixmaps/grass/shelf.png
-share/gnome/mcatalog/pixmaps/leather/background.jpg
-share/gnome/mcatalog/pixmaps/leather/shelf.png
-share/gnome/mcatalog/pixmaps/littlestar.png
-share/gnome/mcatalog/pixmaps/logo.png
-share/gnome/mcatalog/pixmaps/mcatalog.png
-share/gnome/mcatalog/pixmaps/metal/background.jpg
-share/gnome/mcatalog/pixmaps/metal/shelf.png
-share/gnome/mcatalog/pixmaps/shelfbg.png
-share/gnome/mcatalog/pixmaps/shelfbgnp.png
-share/gnome/mcatalog/pixmaps/wood/background.jpg
-share/gnome/mcatalog/pixmaps/wood/shelf.png
-share/gnome/mcatalog/templates/albums_printable.html
-share/gnome/mcatalog/templates/albums_printable.png
-share/gnome/mcatalog/templates/albums_printable.rc
-share/gnome/mcatalog/templates/albums_simple.html
-share/gnome/mcatalog/templates/albums_simple.png
-share/gnome/mcatalog/templates/albums_simple.rc
-share/gnome/mcatalog/templates/books_printable.html
-share/gnome/mcatalog/templates/books_printable.png
-share/gnome/mcatalog/templates/books_printable.rc
-share/gnome/mcatalog/templates/books_simple.html
-share/gnome/mcatalog/templates/books_simple.png
-share/gnome/mcatalog/templates/books_simple.rc
-share/gnome/mcatalog/templates/films_printable.html
-share/gnome/mcatalog/templates/films_printable.png
-share/gnome/mcatalog/templates/films_printable.rc
-share/gnome/mcatalog/templates/films_simple.html
-share/gnome/mcatalog/templates/films_simple.png
-share/gnome/mcatalog/templates/films_simple.rc
+share/application-registry/mcatalog.applications
+share/applications/mcatalog.desktop
+share/mcatalog/pixmaps/bigstar.png
+share/mcatalog/pixmaps/borrowed.png
+share/mcatalog/pixmaps/default/background.jpg
+share/mcatalog/pixmaps/default/shelf.png
+share/mcatalog/pixmaps/grass/background.jpg
+share/mcatalog/pixmaps/grass/shelf.png
+share/mcatalog/pixmaps/leather/background.jpg
+share/mcatalog/pixmaps/leather/shelf.png
+share/mcatalog/pixmaps/littlestar.png
+share/mcatalog/pixmaps/logo.png
+share/mcatalog/pixmaps/mcatalog.png
+share/mcatalog/pixmaps/metal/background.jpg
+share/mcatalog/pixmaps/metal/shelf.png
+share/mcatalog/pixmaps/shelfbg.png
+share/mcatalog/pixmaps/shelfbgnp.png
+share/mcatalog/pixmaps/wood/background.jpg
+share/mcatalog/pixmaps/wood/shelf.png
+share/mcatalog/templates/albums_printable.html
+share/mcatalog/templates/albums_printable.png
+share/mcatalog/templates/albums_printable.rc
+share/mcatalog/templates/albums_simple.html
+share/mcatalog/templates/albums_simple.png
+share/mcatalog/templates/albums_simple.rc
+share/mcatalog/templates/books_printable.html
+share/mcatalog/templates/books_printable.png
+share/mcatalog/templates/books_printable.rc
+share/mcatalog/templates/books_simple.html
+share/mcatalog/templates/books_simple.png
+share/mcatalog/templates/books_simple.rc
+share/mcatalog/templates/films_printable.html
+share/mcatalog/templates/films_printable.png
+share/mcatalog/templates/films_printable.rc
+share/mcatalog/templates/films_simple.html
+share/mcatalog/templates/films_simple.png
+share/mcatalog/templates/films_simple.rc
 share/locale/cs/LC_MESSAGES/mcatalog.mo
 share/locale/de/LC_MESSAGES/mcatalog.mo
 share/locale/en_CA/LC_MESSAGES/mcatalog.mo
@@ -58,13 +58,14 @@ share/locale/sv/LC_MESSAGES/mcatalog.mo
 share/locale/zh_CN/LC_MESSAGES/mcatalog.mo
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrm share/gnome/mcatalog/templates
-@dirrm share/gnome/mcatalog/pixmaps/wood
-@dirrm share/gnome/mcatalog/pixmaps/metal
-@dirrm share/gnome/mcatalog/pixmaps/leather
-@dirrm share/gnome/mcatalog/pixmaps/grass
-@dirrm share/gnome/mcatalog/pixmaps/default
-@dirrm share/gnome/mcatalog/pixmaps
-@dirrm share/gnome/mcatalog
+@dirrm share/mcatalog/templates
+@dirrm share/mcatalog/pixmaps/wood
+@dirrm share/mcatalog/pixmaps/metal
+@dirrm share/mcatalog/pixmaps/leather
+@dirrm share/mcatalog/pixmaps/grass
+@dirrm share/mcatalog/pixmaps/default
+@dirrm share/mcatalog/pixmaps
+@dirrm share/mcatalog
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/mcatalog
+@dirrmtry share/applications
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index dd2e60ffc90c..a1334ec55cd6 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME?=	multisync
 PORTVERSION=	0.82
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	multisync
diff --git a/deskutils/multisync/pkg-plist b/deskutils/multisync/pkg-plist
index c6ee139db8e5..91bd2334226a 100644
--- a/deskutils/multisync/pkg-plist
+++ b/deskutils/multisync/pkg-plist
@@ -1,11 +1,12 @@
 bin/multisync
 include/multisync/multisync.h
-share/gnome/applications/multisync.desktop
-share/gnome/multisync/pixmaps/multisync.png
-share/gnome/multisync/pixmaps/multisync.xpm
-share/gnome/multisync/pixmaps/multisync-16.png
-share/gnome/multisync/pixmaps/multisync_small.png
-share/gnome/multisync/pixmaps/resync_small.png
-@dirrm share/gnome/multisync/pixmaps
-@dirrm share/gnome/multisync
+share/applications/multisync.desktop
+share/multisync/pixmaps/multisync.png
+share/multisync/pixmaps/multisync.xpm
+share/multisync/pixmaps/multisync-16.png
+share/multisync/pixmaps/multisync_small.png
+share/multisync/pixmaps/resync_small.png
+@dirrm share/multisync/pixmaps
+@dirrm share/multisync
 @dirrm include/multisync
+@dirrmtry share/applications
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index c7890a76eac1..b01b3446a5de 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -3,11 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.7 2007/03/12 11:50:11 ahze Exp $
+#    $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.13 2007/08/14 17:53:30 marcus Exp $
 
 PORTNAME=	nautilus-sendto
-PORTVERSION=	0.10
-PORTREVISION=	2
+PORTVERSION=	0.12
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
@@ -28,4 +27,14 @@ USE_GETTEXT=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/pidgin)
+BUILD_DEPENDS+=	pidgin:${PORTSDIR}/net-im/pidgin
+RUN_DEPENDS+=	pidgin:${PORTSDIR}/net-im/pidgin
+PLIST_SUB+=	PIDGIN=""
+.else
+PLIST_SUB+=	PIDGIN="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo
index 84bb28e69011..9a1e3f3613c4 100644
--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-sendto-0.10.tar.bz2) = cc47d4364d71d6f35776c5634e2f1ed1
-SHA256 (nautilus-sendto-0.10.tar.bz2) = f5d3a654070464929c751775c767cf39ce27f8f37a7d9ef5f336598631d3ea8d
-SIZE (nautilus-sendto-0.10.tar.bz2) = 322104
+MD5 (nautilus-sendto-0.12.tar.bz2) = 9ec9a476be9a1c24ceddcfd76c6b3be2
+SHA256 (nautilus-sendto-0.12.tar.bz2) = e91af28d5473997836e85aa5eabb39e53f88fdc7cc535d2b0399afdaee1184ab
+SIZE (nautilus-sendto-0.12.tar.bz2) = 336188
diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist
index f72aa18f530a..72c159a3c241 100644
--- a/deskutils/nautilus-sendto/pkg-plist
+++ b/deskutils/nautilus-sendto/pkg-plist
@@ -3,11 +3,15 @@ lib/nautilus-sendto/plugins/libnstbluetooth.la
 lib/nautilus-sendto/plugins/libnstbluetooth.so
 lib/nautilus-sendto/plugins/libnstevolution.la
 lib/nautilus-sendto/plugins/libnstevolution.so
+%%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.la
+%%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.so
 lib/nautilus-sendto/plugins/libnstsylpheed.la
 lib/nautilus-sendto/plugins/libnstsylpheed.so
 lib/nautilus/extensions-1.0/libnautilus-sendto.la
 lib/nautilus/extensions-1.0/libnautilus-sendto.so
-share/gnome/nautilus-sendto/glade/nautilus-sendto.glade
+%%PIDGIN%%lib/pidgin/nautilus.la
+%%PIDGIN%%lib/pidgin/nautilus.so
+share/nautilus-sendto/glade/nautilus-sendto.glade
 share/locale/ar/LC_MESSAGES/nautilus-sendto.mo
 share/locale/be/LC_MESSAGES/nautilus-sendto.mo
 share/locale/bg/LC_MESSAGES/nautilus-sendto.mo
@@ -29,12 +33,14 @@ share/locale/he/LC_MESSAGES/nautilus-sendto.mo
 share/locale/hu/LC_MESSAGES/nautilus-sendto.mo
 share/locale/it/LC_MESSAGES/nautilus-sendto.mo
 share/locale/ja/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ka/LC_MESSAGES/nautilus-sendto.mo
 share/locale/ko/LC_MESSAGES/nautilus-sendto.mo
 share/locale/lt/LC_MESSAGES/nautilus-sendto.mo
 share/locale/mk/LC_MESSAGES/nautilus-sendto.mo
 share/locale/nb/LC_MESSAGES/nautilus-sendto.mo
 share/locale/ne/LC_MESSAGES/nautilus-sendto.mo
 share/locale/nl/LC_MESSAGES/nautilus-sendto.mo
+share/locale/oc/LC_MESSAGES/nautilus-sendto.mo
 share/locale/or/LC_MESSAGES/nautilus-sendto.mo
 share/locale/pa/LC_MESSAGES/nautilus-sendto.mo
 share/locale/pl/LC_MESSAGES/nautilus-sendto.mo
@@ -51,11 +57,13 @@ share/locale/uk/LC_MESSAGES/nautilus-sendto.mo
 share/locale/vi/LC_MESSAGES/nautilus-sendto.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-sendto.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
+@dirrm share/nautilus-sendto/glade
+@dirrm share/nautilus-sendto
+@dirrm lib/nautilus-sendto/plugins
+@dirrm lib/nautilus-sendto
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrm share/gnome/nautilus-sendto/glade
-@dirrm share/gnome/nautilus-sendto
-@dirrm lib/nautilus-sendto/plugins
-@dirrm lib/nautilus-sendto
diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index f6773c12c91c..25f0b91b95a9 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/ontv/Makefile,v 1.5 2007/02/18 19:18:34 mezz Exp $
+#   $MCom: ports/deskutils/ontv/Makefile,v 1.7 2007/07/23 21:02:59 mezz Exp $
 #
 
 PORTNAME=	ontv
 PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/ontv/files/patch-ontv___init__.in.py b/deskutils/ontv/files/patch-ontv___init__.in.py
index a74da50bf327..7813d3e97618 100644
--- a/deskutils/ontv/files/patch-ontv___init__.in.py
+++ b/deskutils/ontv/files/patch-ontv___init__.in.py
@@ -9,7 +9,7 @@
 -UI_DIR = '@prefix@/@DATADIRNAME@/gnome-2.0/ui'
 -LOCALE_DIR = '@prefix@/@DATADIRNAME@/locale'
 +SERVERS_DIR = '@prefix@/libdata/bonobo/servers'
-+DATA_DIR = '@prefix@/share/gnome/ontv'
-+IMAGES_DIR = '@prefix@/share/gnome/ontv/images'
-+UI_DIR = '@prefix@/share/gnome/gnome-2.0/ui'
++DATA_DIR = '@prefix@/share/ontv'
++IMAGES_DIR = '@prefix@/share/ontv/images'
++UI_DIR = '@prefix@/share/gnome-2.0/ui'
 +LOCALE_DIR = '@prefix@/share/locale'
diff --git a/deskutils/ontv/pkg-plist b/deskutils/ontv/pkg-plist
index 074077865516..aa542e1c1362 100644
--- a/deskutils/ontv/pkg-plist
+++ b/deskutils/ontv/pkg-plist
@@ -72,9 +72,9 @@
 %%PYTHON_SITELIBDIR%%/ontv/xmltv.pyo
 libdata/bonobo/servers/GNOME_OnTVApplet.server
 libexec/ontv
-share/gnome/gnome-2.0/ui/GNOME_OnTVApplet.xml
-share/gnome/ontv/images/ontv-logo-downloading.png
-share/gnome/ontv/ontv.glade
+share/gnome-2.0/ui/GNOME_OnTVApplet.xml
+share/ontv/images/ontv-logo-downloading.png
+share/ontv/ontv.glade
 share/icons/hicolor/16x16/apps/ontv.png
 share/icons/hicolor/22x22/apps/ontv.png
 share/icons/hicolor/24x24/apps/ontv.png
@@ -103,8 +103,8 @@ share/locale/sv/LC_MESSAGES/ontv.mo
 share/locale/uk/LC_MESSAGES/ontv.mo
 share/locale/vi/LC_MESSAGES/ontv.mo
 share/locale/zh_CN/LC_MESSAGES/ontv.mo
-@dirrm share/gnome/ontv/images
-@dirrm share/gnome/ontv
+@dirrm share/ontv/images
+@dirrm share/ontv
 @dirrm %%PYTHON_SITELIBDIR%%/ontv/keybinder
 @dirrm %%PYTHON_SITELIBDIR%%/ontv
 @dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 40096a532ec1..040474d2b072 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Thierry Thomas <thierry@pompo.net>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	pinot
 PORTVERSION=	0.76
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 #MASTER_SITES=	http://www.chez.com/colinf/pinot/	\
@@ -83,6 +84,8 @@ pre-configure:
 		${UL2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|'	\
 		${SHR2FIX:S|^|${WRKSRC}/|}
+	${REINPLACE_CMD} -e 's|Icon=pinot.png|Icon=pinot|g' \
+		${WRKSRC}/*.desktop
 
 post-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py		\
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index 348fdca06b04..7cc2e8779730 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/planner/Makefile,v 1.1 2005/10/08 19:33:55 marcus Exp $
+#   $MCom: ports/deskutils/planner/Makefile,v 1.4 2007/05/19 21:36:03 marcus Exp $
 #
 
 PORTNAME=	planner
 PORTVERSION=	0.14.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.14
@@ -48,10 +48,6 @@ PLIST_SUB+=	GDA=""
 PLIST_SUB+=	GDA="@comment "
 .endif
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/doc|(prefix)/share/doc|g'
-
 post-install:
 	@-update-desktop-database
 
diff --git a/deskutils/planner/pkg-plist b/deskutils/planner/pkg-plist
index 341d39aeedd3..6a754952a20b 100644
--- a/deskutils/planner/pkg-plist
+++ b/deskutils/planner/pkg-plist
@@ -48,7 +48,7 @@ libdata/pkgconfig/libplanner-1.pc
 %%DOCSDIR%%/README.sql
 %%DOCSDIR%%/kitchen.planner
 %%DOCSDIR%%/sample-1.planner
-share/gnome/applications/planner.desktop
+share/applications/planner.desktop
 share/gnome/help/planner/C/figures/calendar-new.png
 share/gnome/help/planner/C/figures/calendar-week.png
 share/gnome/help/planner/C/figures/calendar-working-time.png
@@ -143,64 +143,64 @@ share/gnome/help/planner/eu/figures/task-up.png
 share/gnome/help/planner/eu/figures/task-view.png
 share/gnome/help/planner/eu/legal.xml
 share/gnome/help/planner/eu/planner.xml
-share/gnome/omf/planner/planner-C.omf
-share/gnome/omf/planner/planner-eu.omf
-share/gnome/pixmaps/gnome-planner.png
-share/gnome/planner/dtd/mrproject-0.5.1.dtd
-share/gnome/planner/dtd/mrproject-0.6.dtd
-share/gnome/planner/glade/add-predecessor.glade
-share/gnome/planner/glade/calendar-dialog.glade
-share/gnome/planner/glade/column-dialog.glade
-share/gnome/planner/glade/eds.glade
-share/gnome/planner/glade/group-dialog.glade
-share/gnome/planner/glade/new-property.glade
-share/gnome/planner/glade/project-properties.glade
-share/gnome/planner/glade/property-dialog.glade
-share/gnome/planner/glade/resource-dialog.glade
-share/gnome/planner/glade/resource-input-dialog.glade
-share/gnome/planner/glade/sql.glade
-share/gnome/planner/glade/task-date-widget.glade
-share/gnome/planner/glade/task-dialog.glade
-share/gnome/planner/glade/task-input-dialog.glade
-share/gnome/planner/images/24_edit_resource.png
-share/gnome/planner/images/24_groups.png
-share/gnome/planner/images/24_indent_task.png
-share/gnome/planner/images/24_insert_resource.png
-share/gnome/planner/images/24_insert_task.png
-share/gnome/planner/images/24_link_task.png
-share/gnome/planner/images/24_remove_resource.png
-share/gnome/planner/images/24_remove_task.png
-share/gnome/planner/images/24_task_down.png
-share/gnome/planner/images/24_task_up.png
-share/gnome/planner/images/24_unindent_task.png
-share/gnome/planner/images/24_unlink_task.png
-share/gnome/planner/images/gantt.png
-share/gnome/planner/images/gnome-planner.png
-share/gnome/planner/images/resources.png
-share/gnome/planner/images/resources_usage.png
-share/gnome/planner/images/tasks.png
-share/gnome/planner/sql/database-0.11.sql
-share/gnome/planner/sql/database-0.13.sql
-share/gnome/planner/sql/upgrade-0.11-0.13.sql
-share/gnome/planner/sql/database.sql
-share/gnome/planner/sql/upgrade-0.6.x-0.11.sql
-share/gnome/planner/stylesheets/html1_css.xsl
-share/gnome/planner/stylesheets/html1_gantt.xsl
-share/gnome/planner/stylesheets/html1_resources.xsl
-share/gnome/planner/stylesheets/html1_tasks.xsl
-share/gnome/planner/stylesheets/msp2planner.xsl
-share/gnome/planner/stylesheets/planner2html.xsl
-share/gnome/planner/stylesheets/planner2plannerv011.xsl
-share/gnome/planner/ui/eds-plugin.ui
-share/gnome/planner/ui/gantt-view.ui
-share/gnome/planner/ui/html-plugin.ui
-share/gnome/planner/ui/main-window.ui
-share/gnome/planner/ui/msp-plugin.ui
-share/gnome/planner/ui/resource-view.ui
-share/gnome/planner/ui/sql-plugin.ui
-share/gnome/planner/ui/task-view.ui
-share/gnome/planner/ui/time-table-view.ui
-share/gnome/planner/ui/xml-planner-plugin.ui
+share/omf/planner/planner-C.omf
+share/omf/planner/planner-eu.omf
+share/pixmaps/gnome-planner.png
+share/planner/dtd/mrproject-0.5.1.dtd
+share/planner/dtd/mrproject-0.6.dtd
+share/planner/glade/add-predecessor.glade
+share/planner/glade/calendar-dialog.glade
+share/planner/glade/column-dialog.glade
+share/planner/glade/eds.glade
+share/planner/glade/group-dialog.glade
+share/planner/glade/new-property.glade
+share/planner/glade/project-properties.glade
+share/planner/glade/property-dialog.glade
+share/planner/glade/resource-dialog.glade
+share/planner/glade/resource-input-dialog.glade
+share/planner/glade/sql.glade
+share/planner/glade/task-date-widget.glade
+share/planner/glade/task-dialog.glade
+share/planner/glade/task-input-dialog.glade
+share/planner/images/24_edit_resource.png
+share/planner/images/24_groups.png
+share/planner/images/24_indent_task.png
+share/planner/images/24_insert_resource.png
+share/planner/images/24_insert_task.png
+share/planner/images/24_link_task.png
+share/planner/images/24_remove_resource.png
+share/planner/images/24_remove_task.png
+share/planner/images/24_task_down.png
+share/planner/images/24_task_up.png
+share/planner/images/24_unindent_task.png
+share/planner/images/24_unlink_task.png
+share/planner/images/gantt.png
+share/planner/images/gnome-planner.png
+share/planner/images/resources.png
+share/planner/images/resources_usage.png
+share/planner/images/tasks.png
+share/planner/sql/database-0.11.sql
+share/planner/sql/database-0.13.sql
+share/planner/sql/upgrade-0.11-0.13.sql
+share/planner/sql/database.sql
+share/planner/sql/upgrade-0.6.x-0.11.sql
+share/planner/stylesheets/html1_css.xsl
+share/planner/stylesheets/html1_gantt.xsl
+share/planner/stylesheets/html1_resources.xsl
+share/planner/stylesheets/html1_tasks.xsl
+share/planner/stylesheets/msp2planner.xsl
+share/planner/stylesheets/planner2html.xsl
+share/planner/stylesheets/planner2plannerv011.xsl
+share/planner/ui/eds-plugin.ui
+share/planner/ui/gantt-view.ui
+share/planner/ui/html-plugin.ui
+share/planner/ui/main-window.ui
+share/planner/ui/msp-plugin.ui
+share/planner/ui/resource-view.ui
+share/planner/ui/sql-plugin.ui
+share/planner/ui/task-view.ui
+share/planner/ui/time-table-view.ui
+share/planner/ui/xml-planner-plugin.ui
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-planner.png
 share/locale/ar/LC_MESSAGES/planner.mo
 share/locale/am/LC_MESSAGES/planner.mo
@@ -255,18 +255,14 @@ share/locale/zh_CN/LC_MESSAGES/planner.mo
 share/locale/zh_TW/LC_MESSAGES/planner.mo
 share/mime/application/x-planner.xml
 share/mime/packages/planner.xml
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrm share/gnome/planner/ui
-@dirrm share/gnome/planner/stylesheets
-@dirrm share/gnome/planner/sql
-@dirrm share/gnome/planner/images
-@dirrm share/gnome/planner/glade
-@dirrm share/gnome/planner/dtd
-@dirrm share/gnome/planner
-@dirrm share/gnome/omf/planner
+@dirrm share/planner/ui
+@dirrm share/planner/stylesheets
+@dirrm share/planner/sql
+@dirrm share/planner/images
+@dirrm share/planner/glade
+@dirrm share/planner/dtd
+@dirrm share/planner
+@dirrm share/omf/planner
 @dirrm share/gnome/help/planner/eu/figures
 @dirrm share/gnome/help/planner/eu
 @dirrm share/gnome/help/planner/C/figures
@@ -284,3 +280,8 @@ share/mime/packages/planner.xml
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index fa58445fe7d8..c242d36faa78 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rubrica
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/rubrica/pkg-plist b/deskutils/rubrica/pkg-plist
index c1500e3d56d1..55409be9af0c 100644
--- a/deskutils/rubrica/pkg-plist
+++ b/deskutils/rubrica/pkg-plist
@@ -90,68 +90,68 @@ libdata/pkgconfig/libral.pc
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/rubrica2.desktop
-share/gnome/mime-info/rubrica2.keys
-share/gnome/mime-info/rubrica2.mime
-share/gnome/pixmaps/rubrica2/16x16/ccare.png
-share/gnome/pixmaps/rubrica2/16x16/green.png
-share/gnome/pixmaps/rubrica2/16x16/operator.png
-share/gnome/pixmaps/rubrica2/24x24/stuffs.png
-share/gnome/pixmaps/rubrica2/24x24/university.png
-share/gnome/pixmaps/rubrica2/48x48/all.png
-share/gnome/pixmaps/rubrica2/48x48/bussines.png
-share/gnome/pixmaps/rubrica2/48x48/chat.png
-share/gnome/pixmaps/rubrica2/48x48/contacts.png
-share/gnome/pixmaps/rubrica2/48x48/customer.png
-share/gnome/pixmaps/rubrica2/48x48/flame.png
-share/gnome/pixmaps/rubrica2/48x48/freebsd.png
-share/gnome/pixmaps/rubrica2/48x48/gnu.png
-share/gnome/pixmaps/rubrica2/48x48/hobbies.png
-share/gnome/pixmaps/rubrica2/48x48/keys.png
-share/gnome/pixmaps/rubrica2/48x48/lock.png
-share/gnome/pixmaps/rubrica2/48x48/mailbox.png
-share/gnome/pixmaps/rubrica2/48x48/net.png
-share/gnome/pixmaps/rubrica2/48x48/notes.png
-share/gnome/pixmaps/rubrica2/48x48/phone.png
-share/gnome/pixmaps/rubrica2/48x48/photo.png
-share/gnome/pixmaps/rubrica2/48x48/puzzle.png
-share/gnome/pixmaps/rubrica2/48x48/rate1.png
-share/gnome/pixmaps/rubrica2/48x48/rate2.png
-share/gnome/pixmaps/rubrica2/48x48/rate3.png
-share/gnome/pixmaps/rubrica2/48x48/rate4.png
-share/gnome/pixmaps/rubrica2/48x48/rate5.png
-share/gnome/pixmaps/rubrica2/48x48/role.png
-share/gnome/pixmaps/rubrica2/48x48/rubrica.png
-share/gnome/pixmaps/rubrica2/48x48/search-contact.png
-share/gnome/pixmaps/rubrica2/48x48/sport.png
-share/gnome/pixmaps/rubrica2/48x48/strategies.png
-share/gnome/pixmaps/rubrica2/48x48/tux.png
-share/gnome/pixmaps/rubrica2/scalable/card_photo.svg
-share/gnome/pixmaps/rubrica2/scalable/query.svg
-share/gnome/rubrica2/interface/CompanyCard.glade
-share/gnome/rubrica2/interface/GroupManager.glade
-share/gnome/rubrica2/interface/MainWindow.glade
-share/gnome/rubrica2/interface/Menu.glade
-share/gnome/rubrica2/interface/MenuTrash.glade
-share/gnome/rubrica2/interface/PersonalCard.glade
-share/gnome/rubrica2/interface/Preferences.glade
-share/gnome/rubrica2/interface/Search.glade
-share/gnome/rubrica2/interface/logo.png
+share/applications/rubrica2.desktop
+share/mime-info/rubrica2.keys
+share/mime-info/rubrica2.mime
+share/pixmaps/rubrica2/16x16/ccare.png
+share/pixmaps/rubrica2/16x16/green.png
+share/pixmaps/rubrica2/16x16/operator.png
+share/pixmaps/rubrica2/24x24/stuffs.png
+share/pixmaps/rubrica2/24x24/university.png
+share/pixmaps/rubrica2/48x48/all.png
+share/pixmaps/rubrica2/48x48/bussines.png
+share/pixmaps/rubrica2/48x48/chat.png
+share/pixmaps/rubrica2/48x48/contacts.png
+share/pixmaps/rubrica2/48x48/customer.png
+share/pixmaps/rubrica2/48x48/flame.png
+share/pixmaps/rubrica2/48x48/freebsd.png
+share/pixmaps/rubrica2/48x48/gnu.png
+share/pixmaps/rubrica2/48x48/hobbies.png
+share/pixmaps/rubrica2/48x48/keys.png
+share/pixmaps/rubrica2/48x48/lock.png
+share/pixmaps/rubrica2/48x48/mailbox.png
+share/pixmaps/rubrica2/48x48/net.png
+share/pixmaps/rubrica2/48x48/notes.png
+share/pixmaps/rubrica2/48x48/phone.png
+share/pixmaps/rubrica2/48x48/photo.png
+share/pixmaps/rubrica2/48x48/puzzle.png
+share/pixmaps/rubrica2/48x48/rate1.png
+share/pixmaps/rubrica2/48x48/rate2.png
+share/pixmaps/rubrica2/48x48/rate3.png
+share/pixmaps/rubrica2/48x48/rate4.png
+share/pixmaps/rubrica2/48x48/rate5.png
+share/pixmaps/rubrica2/48x48/role.png
+share/pixmaps/rubrica2/48x48/rubrica.png
+share/pixmaps/rubrica2/48x48/search-contact.png
+share/pixmaps/rubrica2/48x48/sport.png
+share/pixmaps/rubrica2/48x48/strategies.png
+share/pixmaps/rubrica2/48x48/tux.png
+share/pixmaps/rubrica2/scalable/card_photo.svg
+share/pixmaps/rubrica2/scalable/query.svg
+share/rubrica2/interface/CompanyCard.glade
+share/rubrica2/interface/GroupManager.glade
+share/rubrica2/interface/MainWindow.glade
+share/rubrica2/interface/Menu.glade
+share/rubrica2/interface/MenuTrash.glade
+share/rubrica2/interface/PersonalCard.glade
+share/rubrica2/interface/Preferences.glade
+share/rubrica2/interface/Search.glade
+share/rubrica2/interface/logo.png
 share/locale/de/LC_MESSAGES/rubrica2.mo
 share/locale/it/LC_MESSAGES/rubrica2.mo
 share/locale/uk/LC_MESSAGES/rubrica2.mo
-@dirrm share/gnome/rubrica2/interface
-@dirrm share/gnome/rubrica2
-@dirrm share/gnome/pixmaps/rubrica2/scalable
-@dirrm share/gnome/pixmaps/rubrica2/48x48
-@dirrm share/gnome/pixmaps/rubrica2/24x24
-@dirrm share/gnome/pixmaps/rubrica2/22x22
-@dirrm share/gnome/pixmaps/rubrica2/16x16
-@dirrm share/gnome/pixmaps/rubrica2
+@dirrm share/rubrica2/interface
+@dirrm share/rubrica2
+@dirrm share/pixmaps/rubrica2/scalable
+@dirrm share/pixmaps/rubrica2/48x48
+@dirrm share/pixmaps/rubrica2/24x24
+@dirrm share/pixmaps/rubrica2/22x22
+@dirrm share/pixmaps/rubrica2/16x16
+@dirrm share/pixmaps/rubrica2
 %%PORTDOCS%%@dirrm share/doc/libRAL
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry lib/libral/plugins
 @dirrmtry lib/libral
 @dirrmtry include/libral-1.0/libral
 @dirrmtry include/libral-1.0
-
+@dirrmtry share/applications
diff --git a/deskutils/splashsetter/Makefile b/deskutils/splashsetter/Makefile
index eab9917440f5..7fbe61967297 100644
--- a/deskutils/splashsetter/Makefile
+++ b/deskutils/splashsetter/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	splashsetter
-PORTVERSION=	0.6.5.2
-PORTREVISION=	1
+PORTVERSION=	0.6.5.3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://webonaut.com/distfiles/${PORTNAME}/
 
@@ -20,7 +19,7 @@ USE_PYTHON=	yes
 USE_GNOME=	pygnome2 gnomeprefix
 
 do-build:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${PREFIX}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
 		${WRKSRC}/*.py
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
@@ -28,20 +27,20 @@ do-build:
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-	${MKDIR} ${PREFIX}/share/gnome/pixmaps/${PORTNAME}/splash
+	${MKDIR} ${PREFIX}/share/pixmaps/${PORTNAME}/splash
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
 	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} \
 		${PREFIX}/libexec/${PORTNAME}/
 	@${INSTALL_DATA} ${WRKSRC}/*.py* \
 		${PREFIX}/libexec/${PORTNAME}/
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
-		${PREFIX}/share/gnome/applications/
+		${PREFIX}/share/applications/
 	@${INSTALL_DATA} ${WRKSRC}/*.svg \
-		${PREFIX}/share/gnome/pixmaps/${PORTNAME}/
+		${PREFIX}/share/pixmaps/${PORTNAME}/
 	@${INSTALL_DATA} ${WRKSRC}/splashsetter_icon.svg \
-		${PREFIX}/share/gnome/pixmaps/${PORTNAME}.svg
+		${PREFIX}/share/pixmaps/${PORTNAME}.svg
 	@${INSTALL_DATA} ${WRKSRC}/*.png \
-		${PREFIX}/share/gnome/pixmaps/${PORTNAME}/splash/
+		${PREFIX}/share/pixmaps/${PORTNAME}/splash/
 	@${LN} -sf ${PREFIX}/libexec/${PORTNAME}/${PORTNAME} \
 		${PREFIX}/bin/${PORTNAME}
 
diff --git a/deskutils/splashsetter/distinfo b/deskutils/splashsetter/distinfo
index 879a81bcdaa1..f60426d60a16 100644
--- a/deskutils/splashsetter/distinfo
+++ b/deskutils/splashsetter/distinfo
@@ -1,3 +1,3 @@
-MD5 (splashsetter-0.6.5.2.tar.bz2) = 467b2b489bca8af00e9987d0323049f7
-SHA256 (splashsetter-0.6.5.2.tar.bz2) = 2c46408b9da812a2b82a13fb0aead3a3a93c03333a0dabbf5744e5ee8319b729
-SIZE (splashsetter-0.6.5.2.tar.bz2) = 45179
+MD5 (splashsetter-0.6.5.3.tar.bz2) = 8325753f976ef5038eb60160695ac79e
+SHA256 (splashsetter-0.6.5.3.tar.bz2) = 66238e926a4ed2fe8c121865243af840e42cc9bd25bc6aa586fd0d91dd93d296
+SIZE (splashsetter-0.6.5.3.tar.bz2) = 45268
diff --git a/deskutils/splashsetter/pkg-plist b/deskutils/splashsetter/pkg-plist
index 69c7759a178a..9413b18d8652 100644
--- a/deskutils/splashsetter/pkg-plist
+++ b/deskutils/splashsetter/pkg-plist
@@ -9,11 +9,12 @@ libexec/splashsetter/splash_set_gui_lib.py
 libexec/splashsetter/splash_set_gui_lib.pyc
 libexec/splashsetter/splash_set_gui_lib.pyo
 libexec/splashsetter/splashsetter
-share/gnome/applications/splashsetter.desktop
-share/gnome/pixmaps/splashsetter.svg
-share/gnome/pixmaps/splashsetter/splashsetter_icon.svg
-share/gnome/pixmaps/splashsetter/splashsetter_logo.svg
-share/gnome/pixmaps/splashsetter/splash/splashsetter_splash.png
-@dirrm share/gnome/pixmaps/splashsetter/splash
-@dirrm share/gnome/pixmaps/splashsetter
+share/applications/splashsetter.desktop
+share/pixmaps/splashsetter.svg
+share/pixmaps/splashsetter/splashsetter_icon.svg
+share/pixmaps/splashsetter/splashsetter_logo.svg
+share/pixmaps/splashsetter/splash/splashsetter_splash.png
+@dirrm share/pixmaps/splashsetter/splash
+@dirrm share/pixmaps/splashsetter
 @dirrm libexec/splashsetter
+@dirrmtry share/applications
diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile
index 5acb0981a84a..1a154519cdc1 100644
--- a/deskutils/superswitcher/Makefile
+++ b/deskutils/superswitcher/Makefile
@@ -3,6 +3,7 @@
 # Whom:					Remington Lang <MrL0Lz@gmail.com>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	superswitcher
 PORTVERSION=	0.3
@@ -20,11 +21,16 @@ RUN_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
 
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 libwnck pango
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+post-extract:
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${RM} -f
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/x11//g' ${WRKSRC}/configure
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/superswitcher ${PREFIX}/bin
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
 
 .include <bsd.port.mk>
diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 2d580ca547a5..1ddb4d4371d9 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	timer-applet
 PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	timerapplet
@@ -16,7 +16,7 @@ MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	A timer applet for the GNOME panel
 
 LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	${LOCALBASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnome-audio
+RUN_DEPENDS=	${LOCALBASE}/share/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnome-audio
 
 USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack
 GNU_CONFIGURE=	yes
@@ -28,10 +28,7 @@ INSTALLS_OMF=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/usr/share/pixmaps/|${PREFIX}/share/gnome/pixmaps/|' \
+		's|/usr/share/pixmaps/|${PREFIX}/share/pixmaps/|' \
 		${WRKSRC}/GNOME_TimerApplet.server.in.in
-	@${REINPLACE_CMD} -e \
-		's|$$(datadir)/sounds|${LOCALBASE}/share/gnome/sounds|' \
-		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/deskutils/timer-applet/pkg-plist b/deskutils/timer-applet/pkg-plist
index 1359518a71a9..b21133427ce6 100644
--- a/deskutils/timer-applet/pkg-plist
+++ b/deskutils/timer-applet/pkg-plist
@@ -1,13 +1,13 @@
 libdata/bonobo/servers/GNOME_TimerApplet.server
 libexec/timer-applet
-share/gnome/gnome-2.0/ui/GNOME_TimerApplet.xml
+share/gnome-2.0/ui/GNOME_TimerApplet.xml
 share/gnome/help/timer-applet/C/legal.xml
 share/gnome/help/timer-applet/C/timer-applet.xml
 share/gnome/help/timer-applet/fr/legal.xml
 share/gnome/help/timer-applet/fr/timer-applet.xml
-share/gnome/omf/timer-applet/timer-applet-C.omf
-share/gnome/omf/timer-applet/timer-applet-fr.omf
-share/gnome/pixmaps/timer-applet/timer-applet-icon.png
+share/omf/timer-applet/timer-applet-C.omf
+share/omf/timer-applet/timer-applet-fr.omf
+share/pixmaps/timer-applet/timer-applet-icon.png
 share/locale/de/LC_MESSAGES/timer-applet.mo
 share/locale/eo/LC_MESSAGES/timer-applet.mo
 share/locale/es/LC_MESSAGES/timer-applet.mo
@@ -22,5 +22,5 @@ share/locale/tr/LC_MESSAGES/timer-applet.mo
 @dirrm share/gnome/help/timer-applet/C
 @dirrm share/gnome/help/timer-applet/fr
 @dirrm share/gnome/help/timer-applet
-@dirrm share/gnome/omf/timer-applet
-@dirrm share/gnome/pixmaps/timer-applet
+@dirrm share/omf/timer-applet
+@dirrm share/pixmaps/timer-applet
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 6e13f896ef32..71edbd032d70 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	tomboy
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/tomboy/files/patch-Tomboy_Defines.cs.in b/deskutils/tomboy/files/patch-Tomboy_Defines.cs.in
deleted file mode 100644
index 9c8c5b8c1719..000000000000
--- a/deskutils/tomboy/files/patch-Tomboy_Defines.cs.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Tomboy/Defines.cs.in.orig	Thu Dec  7 19:06:17 2006
-+++ Tomboy/Defines.cs.in	Sun Jan 21 00:02:01 2007
-@@ -8,7 +8,7 @@
- 		public const string VERSION          = "@version@";
- 		public const string DATADIR          = "@datadir@";
- 		public const string GNOME_LOCALE_DIR = "@datadir@/locale";
--		public const string GNOME_HELP_DIR   = "@datadir@/gnome/help/tomboy";
-+		public const string GNOME_HELP_DIR   = "@datadir@/help/tomboy";
- 		public const string PKGLIBDIR        = "@pkglibdir@";
- 		public const string SYS_PLUGINS_DIR  = "@pkglibdir@/Plugins";
- 	}
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index 2c136105a109..1bde9307f1a6 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -24,7 +24,7 @@ lib/tomboy/libtomboy.so
 libdata/bonobo/servers/GNOME_TomboyApplet.server
 libdata/pkgconfig/tomboy-addins.pc
 share/dbus-1/services/org.gnome.Tomboy.service
-share/gnome/applications/tomboy.desktop
+share/applications/tomboy.desktop
 share/gnome/help/tomboy/C/legal.xml
 share/gnome/help/tomboy/C/tomboy.xml
 share/gnome/help/tomboy/C/figures/tomboy-main-menu.png
@@ -145,17 +145,17 @@ share/gnome/help/tomboy/uk/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/uk/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/uk/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/uk/figures/tomboy-tools.png
-share/gnome/omf/tomboy/tomboy-C.omf
-share/gnome/omf/tomboy/tomboy-ca.omf
-share/gnome/omf/tomboy/tomboy-en_GB.omf
-share/gnome/omf/tomboy/tomboy-es.omf
-share/gnome/omf/tomboy/tomboy-fr.omf
-share/gnome/omf/tomboy/tomboy-pt_BR.omf
-share/gnome/omf/tomboy/tomboy-ru.omf
-share/gnome/omf/tomboy/tomboy-oc.omf
-share/gnome/omf/tomboy/tomboy-sv.omf
-share/gnome/omf/tomboy/tomboy-uk.omf
-share/gnome/pixmaps/tomboy.png
+share/omf/tomboy/tomboy-C.omf
+share/omf/tomboy/tomboy-ca.omf
+share/omf/tomboy/tomboy-en_GB.omf
+share/omf/tomboy/tomboy-es.omf
+share/omf/tomboy/tomboy-fr.omf
+share/omf/tomboy/tomboy-pt_BR.omf
+share/omf/tomboy/tomboy-ru.omf
+share/omf/tomboy/tomboy-oc.omf
+share/omf/tomboy/tomboy-sv.omf
+share/omf/tomboy/tomboy-uk.omf
+share/pixmaps/tomboy.png
 share/icons/hicolor/16x16/apps/tomboy-tag.png
 share/icons/hicolor/16x16/apps/tomboy-note.png
 share/icons/hicolor/16x16/apps/tomboy.png
@@ -266,7 +266,7 @@ share/locale/zh_TW/LC_MESSAGES/tomboy.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be
-@dirrm share/gnome/omf/tomboy
+@dirrm share/omf/tomboy
 @dirrm share/gnome/help/tomboy/uk/figures
 @dirrm share/gnome/help/tomboy/uk
 @dirrm share/gnome/help/tomboy/sv/figures
@@ -290,3 +290,4 @@ share/locale/zh_TW/LC_MESSAGES/tomboy.mo
 @dirrm share/gnome/help/tomboy
 @dirrm lib/tomboy/addins
 @dirrm lib/tomboy
+@dirrmtry share/applications
author	marcus <marcus@FreeBSD.org>	2007-10-25 07:37:25 +0800
committer	marcus <marcus@FreeBSD.org>	2007-10-25 07:37:25 +0800
commit	43bd9f14d9ce11690e9538bf3b03d3462faa6dbe (patch)
tree	da347910089a96d6d726b8bb080f62c773263828 /deskutils
parent	2e669ed08a56339ee1a8b2a0573a30147f95bd82 (diff)
download	freebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.tar.gz freebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.tar.zst freebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.zip