Update to KDE 3.4.1

author: lofi <lofi@FreeBSD.org> 2005-06-26 23:38:58 +0800
committer: lofi <lofi@FreeBSD.org> 2005-06-26 23:38:58 +0800
commit: 8cd1837ecbc0bb30f0ee97e6b6f5886e8b02a92d (patch)
tree: 918c137aff4fc4dc13581cf186d5289f068e5c7c /misc/kde3-i18n-ro
parent: 7967f86d817b4102f6553a035e7d163843188d8a (diff)
download: freebsd-ports-gnome-8cd1837ecbc0bb30f0ee97e6b6f5886e8b02a92d.tar.gz
freebsd-ports-gnome-8cd1837ecbc0bb30f0ee97e6b6f5886e8b02a92d.tar.zst
freebsd-ports-gnome-8cd1837ecbc0bb30f0ee97e6b6f5886e8b02a92d.zip
2 files changed, 5 insertions, 14 deletions
diff --git a/misc/kde3-i18n-ro/distinfo b/misc/kde3-i18n-ro/distinfo
index e2be6902185c..6f672ea28bf0 100644
--- a/misc/kde3-i18n-ro/distinfo
+++ b/misc/kde3-i18n-ro/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/kde-i18n-ro-3.4.0.tar.bz2) = 1794851ee3e5b2c3c7476cf77951b078
-SIZE (KDE/kde-i18n/kde-i18n-ro-3.4.0.tar.bz2) = 4136458
+MD5 (KDE/kde-i18n/kde-i18n-ro-3.4.1.tar.bz2) = 59b9771ea148a16987ffa219c5bf8012
+SIZE (KDE/kde-i18n/kde-i18n-ro-3.4.1.tar.bz2) = 3042966
diff --git a/misc/kde3-i18n-ro/pkg-plist b/misc/kde3-i18n-ro/pkg-plist
index 14e8294b644d..a6ef5fe102e8 100644
--- a/misc/kde3-i18n-ro/pkg-plist
+++ b/misc/kde3-i18n-ro/pkg-plist
@@ -76,8 +76,6 @@ share/doc/HTML/ro/common/web-docbottom.png
 share/doc/HTML/ro/common/web-doctop.png
 share/doc/HTML/ro/common/x11-license.html
 share/doc/HTML/ro/common/xml.dcl
-share/doc/HTML/ro/khelpcenter/background.png
-share/doc/HTML/ro/khelpcenter/bgtable.png
 share/doc/HTML/ro/khelpcenter/common
 share/doc/HTML/ro/khelpcenter/contact.docbook
 share/doc/HTML/ro/khelpcenter/glossary/common
@@ -87,14 +85,7 @@ share/doc/HTML/ro/khelpcenter/glossary/kdeprintingglossary.docbook
 share/doc/HTML/ro/khelpcenter/help.docbook
 share/doc/HTML/ro/khelpcenter/index.cache.bz2
 share/doc/HTML/ro/khelpcenter/index.docbook
-share/doc/HTML/ro/khelpcenter/kdelogo2.png
-share/doc/HTML/ro/khelpcenter/khelpcenter.png
-share/doc/HTML/ro/khelpcenter/konq.css
-share/doc/HTML/ro/khelpcenter/lines.png
-share/doc/HTML/ro/khelpcenter/lines2.png
 share/doc/HTML/ro/khelpcenter/links.docbook
-share/doc/HTML/ro/khelpcenter/pointers.png
-share/doc/HTML/ro/khelpcenter/shadow1.png
 share/doc/HTML/ro/khelpcenter/support.docbook
 share/doc/HTML/ro/khelpcenter/visualdict/common
 share/doc/HTML/ro/khelpcenter/visualdict/index.cache.bz2
@@ -309,7 +300,6 @@ share/locale/ro/LC_MESSAGES/kbruch.mo
 share/locale/ro/LC_MESSAGES/kbugbuster.mo
 share/locale/ro/LC_MESSAGES/kcachegrind.mo
 share/locale/ro/LC_MESSAGES/kcalc.mo
-share/locale/ro/LC_MESSAGES/kcardchooser.mo
 share/locale/ro/LC_MESSAGES/kcharselect.mo
 share/locale/ro/LC_MESSAGES/kcharselectapplet.mo
 share/locale/ro/LC_MESSAGES/kcm_krfb.mo
@@ -351,7 +341,6 @@ share/locale/ro/LC_MESSAGES/kcmkonsole.mo
 share/locale/ro/LC_MESSAGES/kcmkontactnt.mo
 share/locale/ro/LC_MESSAGES/kcmktalkd.mo
 share/locale/ro/LC_MESSAGES/kcmkttsd.mo
-share/locale/ro/LC_MESSAGES/kcmkttsmgr.mo
 share/locale/ro/LC_MESSAGES/kcmkuick.mo
 share/locale/ro/LC_MESSAGES/kcmkurifilt.mo
 share/locale/ro/LC_MESSAGES/kcmkvaio.mo
@@ -366,7 +355,6 @@ share/locale/ro/LC_MESSAGES/kcmlaptop.mo
 share/locale/ro/LC_MESSAGES/kcmlaunch.mo
 share/locale/ro/LC_MESSAGES/kcmlayout.mo
 share/locale/ro/LC_MESSAGES/kcmlilo.mo
-share/locale/ro/LC_MESSAGES/kcmlinuz.mo
 share/locale/ro/LC_MESSAGES/kcmlirc.mo
 share/locale/ro/LC_MESSAGES/kcmlocale.mo
 share/locale/ro/LC_MESSAGES/kcmmediacontrol.mo
@@ -508,12 +496,15 @@ share/locale/ro/LC_MESSAGES/kio_nfs.mo
 share/locale/ro/LC_MESSAGES/kio_nntp.mo
 share/locale/ro/LC_MESSAGES/kio_pop3.mo
 share/locale/ro/LC_MESSAGES/kio_print.mo
+share/locale/ro/LC_MESSAGES/kio_remote.mo
 share/locale/ro/LC_MESSAGES/kio_settings.mo
 share/locale/ro/LC_MESSAGES/kio_sftp.mo
 share/locale/ro/LC_MESSAGES/kio_sieve.mo
 share/locale/ro/LC_MESSAGES/kio_smb.mo
 share/locale/ro/LC_MESSAGES/kio_smtp.mo
 share/locale/ro/LC_MESSAGES/kio_svn.mo
+share/locale/ro/LC_MESSAGES/kio_system.mo
+share/locale/ro/LC_MESSAGES/kio_trash.mo
 share/locale/ro/LC_MESSAGES/kioexec.mo
 share/locale/ro/LC_MESSAGES/kiten.mo
 share/locale/ro/LC_MESSAGES/kjobviewer.mo
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index b048c96ae80b..ce7bb1291300 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
 #
 # $FreeBSD$
 #	$NetBSD: $
-#     $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.429 2007/08/04 22:09:00 marcus Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -40,9 +40,9 @@ Gnome_Pre_Include=			bsd.gnome.mk
 #					  each .omf file found to track OMF registration database.
 #
 # INSTALLS_ICONS	- If your port installs Freedesktop-style icons to
-#					  ${LOCALBASE}/share/icons or ${X11BASE}/share/icons, then
-#					  you should use this macro. If the icons are not cached,
-#					  they will not be displayed.
+#					  ${LOCALBASE}/share/icons, then you should use this
+#					  macro. If the icons are not cached, they will not be
+#					  displayed.
 #
 
 # non-version specific components
@@ -59,40 +59,25 @@ _USE_GNOME_ALL+= bonobo gal gconf gdkpixbuf glib12 glibwww \
 _USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \
 		gal2 gconf2 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \
 		gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \
-		gtkhtml3 gtksharp10 gtksharp20 gtksourceview libartlgpl2 libbonobo \
-		libbonoboui libgailgnome libgda2 libgda3 libglade2 libgnome \
-		libgnomecanvas libgnomedb libgnomeprint libgnomeprintui \
-		libgnomeui libgsf libgsf_gnome libgtkhtml libidl librsvg2 libwnck \
-		libxml2 libxslt libzvt linc metacity nautilus2 nautiluscdburner \
-		orbit2 pango pygnome2 pygnomeextras pygtk2 vte pygnomedesktop \
-		libgnomekbd
+		gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 \
+		libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 \
+		libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \
+		libgnomeprintui libgnomeui libgsf libgsf_gnome libgtkhtml libidl \
+		librsvg2 libwnck libxml2 libxslt libzvt linc metacity nautilus2 \
+		nautiluscdburner orbit2 pango pygnome2 pygnomedesktop pygnomeextras \
+		pygtk2 pygtksourceview vte
 
 GNOME_MAKEFILEIN?=	Makefile.in
-SCROLLKEEPER_DIR=	/var/db/scrollkeeper
+SCROLLKEEPER_DIR=	/var/db/rarian
 gnomehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${XARGS} ${REINPLACE_CMD} -e \
-				's|[(]GNOME_datadir[)]/gnome/|(datadir)/|g ; \
-				 s|[(]GNOME_datadir[)]/locale|(prefix)/share/locale|g ; \
-				 s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
-				 s|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
-				 s|[(]gnomedatadir[)]/gnome|(gnomedatadir)|g ; \
-				 s|[(]datadir[)]/aclocal|(prefix)/share/aclocal|g ; \
-				 s|[(]datadir[)]/gnome/|(datadir)/|g ; \
-				 s|[(]datadir[)]/mime/|(prefix)/share/mime/|g ; \
-				 s|[(]datadir[)]/mime"|(prefix)/share/mime"|g ; \
-				 s|[(]datadir[)]/mime;|(prefix)/share/mime;|g ; \
-				 s|[(]datadir[)]/mime$$|(prefix)/share/mime|g ; \
-				 s|[(]datadir[)]/dbus-1|(prefix)/share/dbus-1|g ; \
+				's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
 				 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+				 s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 				 s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
-				 s|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g ; \
-				 s|{datadir}/icons/hicolor|{prefix}/share/icons/hicolor|g ; \
 				 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
 			${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 				's|-lpthread|${PTHREAD_LIBS}|g ; \
 				 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-				 s|{datadir}/locale|{prefix}/share/locale|g ; \
-				 s|DATADIR/dbus-1/services|prefix/share/dbus-1/services|g ; \
-				 s|datadir/dbus-1/services|prefix/share/dbus-1/services|g ; \
 				 s|{libdir}/locale|{prefix}/share/locale|g'
 
 referencehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e \
@@ -109,12 +94,10 @@ GNOME_HTML_DIR?=	${PREFIX}/share/doc
 GCONF_CONFIG_OPTIONS?=	merged
 GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults
 GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/${GCONF_CONFIG_DIRECTORY}
-GNOME_LOCALSTATEDIR?=	${PREFIX}/share/gnome
+GNOME_LOCALSTATEDIR?=	${PREFIX}/share
 gnomeprefix_CONFIGURE_ENV=GTKDOC="false"
 gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \
-			   --datadir=${PREFIX}/share/gnome \
 			   --with-html-dir=${GNOME_HTML_DIR} \
-			   --with-help-dir=${PREFIX}/share/gnome/help \
 			   --disable-gtk-doc \
 			   --with-gconf-source=${GCONF_CONFIG_SOURCE}
 gnomeprefix_USE_GNOME_IMPL=gnomehier
@@ -322,11 +305,11 @@ gnomevfs2_USE_GNOME_IMPL=gconf2 libbonobo gnomemimedata
 
 gail_LIB_DEPENDS=	gailutil.18:${PORTSDIR}/accessibility/gail
 gail_DETECT=		${LOCALBASE}/libdata/pkgconfig/gail.pc
-gail_USE_GNOME_IMPL=	libgnomecanvas
+gail_USE_GNOME_IMPL=	gtk20
 
 libgnomecanvas_LIB_DEPENDS=	gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
 libgnomecanvas_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc
-libgnomecanvas_USE_GNOME_IMPL=	libglade2 libartlgpl2
+libgnomecanvas_USE_GNOME_IMPL=	libglade2 libartlgpl2 gail
 
 libartlgpl2_LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl
 libartlgpl2_DETECT=		${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc
@@ -369,7 +352,7 @@ gnomedesktop_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc
 gnomedesktop_USE_GNOME_IMPL=	libgnomeui gnomedocutils
 gnomedesktop_GNOME_DESKTOP_VERSION=2
 
-libwnck_LIB_DEPENDS=	wnck-1.18:${PORTSDIR}/x11-toolkits/libwnck
+libwnck_LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
 libwnck_DETECT=		${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc
 libwnck_USE_GNOME_IMPL=	gtk20
 
@@ -427,6 +410,10 @@ gtksourceview_LIB_DEPENDS=	gtksourceview-1.0.0:${PORTSDIR}/x11-toolkits/gtksourc
 gtksourceview_DETECT=	${LOCALBASE}/libdata/pkgconfig/gtksourceview-1.0.pc
 gtksourceview_USE_GNOME_IMPL=libgnome libgnomeprintui
 
+gtksourceview2_LIB_DEPENDS=	gtksourceview-2.0.0:${PORTSDIR}/x11-toolkits/gtksourceview2
+gtksourceview2_DETECT=	${LOCALBASE}/libdata/pkgconfig/gtksourceview-2.0.pc
+gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2
+
 pkgconfig_DETECT=			${LOCALBASE}/bin/pkg-config
 pkgconfig_BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 pkgconfig_RUN_DEPENDS=		pkg-config:${PORTSDIR}/devel/pkg-config
@@ -518,6 +505,11 @@ libgnomekbd_DETECT=			${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
 libgnomekbd_LIB_DEPENDS=	gnomekbd.1:${PORTSDIR}/x11/libgnomekbd
 libgnomekbd_USE_GNOME_IMPL=	libgnomeui
 
+pygtksourceview_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
+pygtksourceview_BUILD_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
+pygtksourceview_RUN_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
+pygtksourceview_USE_GNOME_IMPL=	gtksourceview2 pygtk2
+
 # End component definition section
 
 # This section defines tests for optional software.  These work off four
diff --git a/UPDATING b/UPDATING
index ac164f8c9c97..592cfdb2fae9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -7,6 +7,33 @@ time you update your ports collection, before attempting any port
 upgrades.
 
 20071024:
+  AFFECTS: All GNOME users and ports depend on gnomehier
+  AUTHOR: gnome@FreeBSD.org
+
+  GNOME has been updated to 2.20.1. All ports that depend on gnomehier have
+  had their DATADIR moved from share/gnome/ to share/ (e.g.
+  ${LOCALBASE}/share/gnome/ to ${LOCALBASE}/share/).
+  This puts the FreeBSD GNOME ports more in line with the default
+  GNOME installation hierarchy. To find the specific directories that
+  have changed, see misc/gnomehier/files/dirlist. To upgrade your
+  installed ports, you will need to use either sysutils/portupgrade or
+  sysutils/portmaster.
+
+    Portupgrade users:
+        # pkgdb -Ff
+        # portupgrade -o textproc/rarian textproc/scrollkeeper
+        # portupgrade -a
+
+    Portmaster users:
+        # portmaster -o textproc/rarian textproc/scrollkeeper
+        # portmaster -a
+
+  If some of icons, applets, themes or other customized items have
+  disappered from your desktop in this upgrade, you will need to
+  remove and re-add these items to make them appear again due to the
+  DATADIR change.
+
+20071024:
   AFFECTS: users of databases/mysql-connector-java
   AUTHOR: miwi@FreeBSD.org
 
diff --git a/accessibility/Makefile b/accessibility/Makefile
index 241425fae4d9..af6030e5312b 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -3,6 +3,7 @@
 
     COMMENT = Ports to help disabled users
 
+    SUBDIR += accerciser
     SUBDIR += at-poke
     SUBDIR += at-spi
     SUBDIR += at-spi-reference
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
new file mode 100644
index 000000000000..aecc9aa18c14
--- /dev/null
+++ b/accessibility/accerciser/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for:	accerciser
+# Date created:		2007-09-17
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/accessibility/accerciser/Makefile,v 1.4 2007/10/13 21:08:59 marcus Exp $
+#
+
+PORTNAME=	accerciser
+PORTVERSION=	1.0.1
+CATEGORIES=	accessibility gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Interactive Python accessibility explorer for GNOME
+
+USE_BZIP2=	yes
+USE_GNOME=	pygnomedesktop
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+USE_PYTHON=	yes
+MAN1=		accerciser.1
+INSTALLS_OMF=	yes
+USE_GETTEXT=	yes
+INSTALLS_ICONS=	yes
+GCONF_SCHEMAS=	accerciser.schemas
+
+.include <bsd.port.mk>
diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo
new file mode 100644
index 000000000000..681dc74bfba4
--- /dev/null
+++ b/accessibility/accerciser/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/accerciser-1.0.1.tar.bz2) = 0bfcef80d75ab5772fca31e5021721c4
+SHA256 (gnome2/accerciser-1.0.1.tar.bz2) = f444711071b15075ddb2c7871b58db3df6c49db62650ee33441d97715e0fdbc9
+SIZE (gnome2/accerciser-1.0.1.tar.bz2) = 858043
diff --git a/accessibility/accerciser/pkg-descr b/accessibility/accerciser/pkg-descr
new file mode 100644
index 000000000000..fe0530271806
--- /dev/null
+++ b/accessibility/accerciser/pkg-descr
@@ -0,0 +1,5 @@
+Accerciser is an interactive Python accessibility explorer for the GNOME
+desktop. It uses AT-SPI to inspect and control widgets, allowing you to check
+if an application is providing correct information to assistive technologies
+and automated test frameworks. Accerciser has a simple plugin framework which
+you can use to create custom views of accessibility information.
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
new file mode 100644
index 000000000000..8f8a5cdba474
--- /dev/null
+++ b/accessibility/accerciser/pkg-plist
@@ -0,0 +1,270 @@
+bin/accerciser
+%%PYTHON_SITELIBDIR%%/accerciser/__init__.py
+%%PYTHON_SITELIBDIR%%/accerciser/__init__.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__init__.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/about_dialog.py
+%%PYTHON_SITELIBDIR%%/accerciser/about_dialog.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/about_dialog.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/accerciser.py
+%%PYTHON_SITELIBDIR%%/accerciser/accerciser.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/accerciser.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/accessible_treeview.py
+%%PYTHON_SITELIBDIR%%/accerciser/accessible_treeview.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/accessible_treeview.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/bookmarks.py
+%%PYTHON_SITELIBDIR%%/accerciser/bookmarks.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/bookmarks.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/hotkey_manager.py
+%%PYTHON_SITELIBDIR%%/accerciser/hotkey_manager.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/hotkey_manager.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/i18n.py
+%%PYTHON_SITELIBDIR%%/accerciser/i18n.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/i18n.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/icons.py
+%%PYTHON_SITELIBDIR%%/accerciser/icons.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/icons.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/main_window.py
+%%PYTHON_SITELIBDIR%%/accerciser/main_window.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/main_window.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/node.py
+%%PYTHON_SITELIBDIR%%/accerciser/node.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/node.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__init__.py
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__init__.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__init__.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/base_plugin.py
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/base_plugin.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/base_plugin.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/message.py
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/message.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/message.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/plugin_manager.py
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/plugin_manager.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/plugin_manager.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/view.py
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/view.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/view.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.py
+%%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/pyatspi.zip
+%%PYTHON_SITELIBDIR%%/accerciser/script_playback.py
+%%PYTHON_SITELIBDIR%%/accerciser/script_playback.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/script_playback.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/tools.py
+%%PYTHON_SITELIBDIR%%/accerciser/tools.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/tools.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/ui_manager.py
+%%PYTHON_SITELIBDIR%%/accerciser/ui_manager.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/ui_manager.pyo
+%%DATADIR%%/pixmaps/hicolor/22x22/acceleratorlabel.png
+%%DATADIR%%/pixmaps/hicolor/22x22/alert.png
+%%DATADIR%%/pixmaps/hicolor/22x22/animation.png
+%%DATADIR%%/pixmaps/hicolor/22x22/arrow.png
+%%DATADIR%%/pixmaps/hicolor/22x22/calendar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/canvas.png
+%%DATADIR%%/pixmaps/hicolor/22x22/care.png
+%%DATADIR%%/pixmaps/hicolor/22x22/character.png
+%%DATADIR%%/pixmaps/hicolor/22x22/chart.png
+%%DATADIR%%/pixmaps/hicolor/22x22/checkbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/checkmenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/clock.png
+%%DATADIR%%/pixmaps/hicolor/22x22/colorchooser.png
+%%DATADIR%%/pixmaps/hicolor/22x22/column.png
+%%DATADIR%%/pixmaps/hicolor/22x22/columnheader.png
+%%DATADIR%%/pixmaps/hicolor/22x22/combobox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/cursor.png
+%%DATADIR%%/pixmaps/hicolor/22x22/dateeditor.png
+%%DATADIR%%/pixmaps/hicolor/22x22/desktopicon.png
+%%DATADIR%%/pixmaps/hicolor/22x22/dial.png
+%%DATADIR%%/pixmaps/hicolor/22x22/dialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/directorypane.png
+%%DATADIR%%/pixmaps/hicolor/22x22/drawingarea.png
+%%DATADIR%%/pixmaps/hicolor/22x22/embedded.png
+%%DATADIR%%/pixmaps/hicolor/22x22/endnote.png
+%%DATADIR%%/pixmaps/hicolor/22x22/entry.png
+%%DATADIR%%/pixmaps/hicolor/22x22/filechooser.png
+%%DATADIR%%/pixmaps/hicolor/22x22/filler.png
+%%DATADIR%%/pixmaps/hicolor/22x22/focustraversable.png
+%%DATADIR%%/pixmaps/hicolor/22x22/fontchooser.png
+%%DATADIR%%/pixmaps/hicolor/22x22/form.png
+%%DATADIR%%/pixmaps/hicolor/22x22/frame.png
+%%DATADIR%%/pixmaps/hicolor/22x22/glasspane.png
+%%DATADIR%%/pixmaps/hicolor/22x22/grip.png
+%%DATADIR%%/pixmaps/hicolor/22x22/heading.png
+%%DATADIR%%/pixmaps/hicolor/22x22/helpballoon.png
+%%DATADIR%%/pixmaps/hicolor/22x22/htmlcontainer.png
+%%DATADIR%%/pixmaps/hicolor/22x22/icon.png
+%%DATADIR%%/pixmaps/hicolor/22x22/image.png
+%%DATADIR%%/pixmaps/hicolor/22x22/imagemap.png
+%%DATADIR%%/pixmaps/hicolor/22x22/inputmethodwindow.png
+%%DATADIR%%/pixmaps/hicolor/22x22/invalid.png
+%%DATADIR%%/pixmaps/hicolor/22x22/label.png
+%%DATADIR%%/pixmaps/hicolor/22x22/link.png
+%%DATADIR%%/pixmaps/hicolor/22x22/list.png
+%%DATADIR%%/pixmaps/hicolor/22x22/listitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/menu.png
+%%DATADIR%%/pixmaps/hicolor/22x22/menubar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/menuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/pagetab.png
+%%DATADIR%%/pixmaps/hicolor/22x22/pagetablist.png
+%%DATADIR%%/pixmaps/hicolor/22x22/passwordtext.png
+%%DATADIR%%/pixmaps/hicolor/22x22/popupmenu.png
+%%DATADIR%%/pixmaps/hicolor/22x22/progressbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/pushbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/radiobutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/radiomenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/row.png
+%%DATADIR%%/pixmaps/hicolor/22x22/ruler.png
+%%DATADIR%%/pixmaps/hicolor/22x22/scrollbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/scrollpane.png
+%%DATADIR%%/pixmaps/hicolor/22x22/section.png
+%%DATADIR%%/pixmaps/hicolor/22x22/separator.png
+%%DATADIR%%/pixmaps/hicolor/22x22/shape.png
+%%DATADIR%%/pixmaps/hicolor/22x22/slider.png
+%%DATADIR%%/pixmaps/hicolor/22x22/sound.png
+%%DATADIR%%/pixmaps/hicolor/22x22/spinbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/splitpane.png
+%%DATADIR%%/pixmaps/hicolor/22x22/statusbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/table.png
+%%DATADIR%%/pixmaps/hicolor/22x22/tablecell.png
+%%DATADIR%%/pixmaps/hicolor/22x22/tearoffmenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/terminal.png
+%%DATADIR%%/pixmaps/hicolor/22x22/text.png
+%%DATADIR%%/pixmaps/hicolor/22x22/togglebutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/toolbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/tooltip.png
+%%DATADIR%%/pixmaps/hicolor/22x22/tree.png
+%%DATADIR%%/pixmaps/hicolor/22x22/treetable.png
+%%DATADIR%%/pixmaps/hicolor/22x22/window.png
+%%DATADIR%%/plugins/api_view.py
+%%DATADIR%%/plugins/console.py
+%%DATADIR%%/plugins/event_monitor.glade
+%%DATADIR%%/plugins/event_monitor.py
+%%DATADIR%%/plugins/interface_view.glade
+%%DATADIR%%/plugins/interface_view.py
+%%DATADIR%%/plugins/ipython_view.py
+%%DATADIR%%/plugins/quick_select.py
+%%DATADIR%%/plugins/script_recorder.glade
+%%DATADIR%%/plugins/script_recorder.py
+share/applications/accerciser.desktop
+share/gnome/help/accerciser/C/accerciser.xml
+share/gnome/help/accerciser/C/figures/accerciser.png
+share/gnome/help/accerciser/C/figures/api_browser.png
+share/gnome/help/accerciser/C/figures/event_monitor.png
+share/gnome/help/accerciser/C/figures/interface_viewer.png
+share/gnome/help/accerciser/C/figures/script_recorder.png
+share/gnome/help/accerciser/C/legal.xml
+share/gnome/help/accerciser/ca/accerciser.xml
+share/gnome/help/accerciser/ca/figures/accerciser.png
+share/gnome/help/accerciser/ca/figures/api_browser.png
+share/gnome/help/accerciser/ca/figures/event_monitor.png
+share/gnome/help/accerciser/ca/figures/interface_viewer.png
+share/gnome/help/accerciser/ca/figures/script_recorder.png
+share/gnome/help/accerciser/en_GB/accerciser.xml
+share/gnome/help/accerciser/en_GB/figures/accerciser.png
+share/gnome/help/accerciser/en_GB/figures/api_browser.png
+share/gnome/help/accerciser/en_GB/figures/event_monitor.png
+share/gnome/help/accerciser/en_GB/figures/interface_viewer.png
+share/gnome/help/accerciser/en_GB/figures/script_recorder.png
+share/gnome/help/accerciser/es/accerciser.xml
+share/gnome/help/accerciser/es/figures/accerciser.png
+share/gnome/help/accerciser/es/figures/api_browser.png
+share/gnome/help/accerciser/es/figures/event_monitor.png
+share/gnome/help/accerciser/es/figures/interface_viewer.png
+share/gnome/help/accerciser/es/figures/script_recorder.png
+share/gnome/help/accerciser/oc/accerciser.xml
+share/gnome/help/accerciser/oc/figures/accerciser.png
+share/gnome/help/accerciser/oc/figures/api_browser.png
+share/gnome/help/accerciser/oc/figures/event_monitor.png
+share/gnome/help/accerciser/oc/figures/interface_viewer.png
+share/gnome/help/accerciser/oc/figures/script_recorder.png
+share/gnome/help/accerciser/sv/accerciser.xml
+share/gnome/help/accerciser/sv/figures/accerciser.png
+share/gnome/help/accerciser/sv/figures/api_browser.png
+share/gnome/help/accerciser/sv/figures/event_monitor.png
+share/gnome/help/accerciser/sv/figures/interface_viewer.png
+share/gnome/help/accerciser/sv/figures/script_recorder.png
+share/icons/hicolor/16x16/apps/accerciser.png
+share/icons/hicolor/22x22/apps/accerciser.png
+share/icons/hicolor/32x32/apps/accerciser.png
+share/icons/hicolor/48x48/apps/accerciser.png
+share/icons/hicolor/scalable/apps/accerciser.svg
+share/locale/ar/LC_MESSAGES/accerciser.mo
+share/locale/bg/LC_MESSAGES/accerciser.mo
+share/locale/bn/LC_MESSAGES/accerciser.mo
+share/locale/bn_IN/LC_MESSAGES/accerciser.mo
+share/locale/ca/LC_MESSAGES/accerciser.mo
+share/locale/da/LC_MESSAGES/accerciser.mo
+share/locale/de/LC_MESSAGES/accerciser.mo
+share/locale/dz/LC_MESSAGES/accerciser.mo
+share/locale/el/LC_MESSAGES/accerciser.mo
+share/locale/en_CA/LC_MESSAGES/accerciser.mo
+share/locale/en_GB/LC_MESSAGES/accerciser.mo
+share/locale/es/LC_MESSAGES/accerciser.mo
+share/locale/fi/LC_MESSAGES/accerciser.mo
+share/locale/fr/LC_MESSAGES/accerciser.mo
+share/locale/gl/LC_MESSAGES/accerciser.mo
+share/locale/gu/LC_MESSAGES/accerciser.mo
+share/locale/he/LC_MESSAGES/accerciser.mo
+share/locale/hi/LC_MESSAGES/accerciser.mo
+share/locale/hu/LC_MESSAGES/accerciser.mo
+share/locale/ja/LC_MESSAGES/accerciser.mo
+share/locale/lt/LC_MESSAGES/accerciser.mo
+share/locale/lv/LC_MESSAGES/accerciser.mo
+share/locale/mk/LC_MESSAGES/accerciser.mo
+share/locale/nb/LC_MESSAGES/accerciser.mo
+share/locale/oc/LC_MESSAGES/accerciser.mo
+share/locale/or/LC_MESSAGES/accerciser.mo
+share/locale/pa/LC_MESSAGES/accerciser.mo
+share/locale/pl/LC_MESSAGES/accerciser.mo
+share/locale/pt/LC_MESSAGES/accerciser.mo
+share/locale/pt_BR/LC_MESSAGES/accerciser.mo
+share/locale/ru/LC_MESSAGES/accerciser.mo
+share/locale/si/LC_MESSAGES/accerciser.mo
+share/locale/sl/LC_MESSAGES/accerciser.mo
+share/locale/sq/LC_MESSAGES/accerciser.mo
+share/locale/sv/LC_MESSAGES/accerciser.mo
+share/locale/te/LC_MESSAGES/accerciser.mo
+share/locale/th/LC_MESSAGES/accerciser.mo
+share/locale/tr/LC_MESSAGES/accerciser.mo
+share/locale/uk/LC_MESSAGES/accerciser.mo
+share/locale/vi/LC_MESSAGES/accerciser.mo
+share/omf/accerciser/accerciser-C.omf
+share/omf/accerciser/accerciser-ca.omf
+share/omf/accerciser/accerciser-en_GB.omf
+share/omf/accerciser/accerciser-es.omf
+share/omf/accerciser/accerciser-oc.omf
+share/omf/accerciser/accerciser-sv.omf
+@dirrm share/omf/accerciser
+@dirrm share/gnome/help/accerciser/sv/figures
+@dirrm share/gnome/help/accerciser/sv
+@dirrm share/gnome/help/accerciser/oc/figures
+@dirrm share/gnome/help/accerciser/oc
+@dirrm share/gnome/help/accerciser/es/figures
+@dirrm share/gnome/help/accerciser/es
+@dirrm share/gnome/help/accerciser/en_GB/figures
+@dirrm share/gnome/help/accerciser/en_GB
+@dirrm share/gnome/help/accerciser/ca/figures
+@dirrm share/gnome/help/accerciser/ca
+@dirrm share/gnome/help/accerciser/C/figures
+@dirrm share/gnome/help/accerciser/C
+@dirrm share/gnome/help/accerciser
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/pixmaps/hicolor/22x22
+@dirrm %%DATADIR%%/pixmaps/hicolor
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/accerciser/plugin
+@dirrm %%PYTHON_SITELIBDIR%%/accerciser
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/accessibility/at-poke/Makefile b/accessibility/at-poke/Makefile
index d198f3cb8686..9f49131e2e07 100644
--- a/accessibility/at-poke/Makefile
+++ b/accessibility/at-poke/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	at-poke
 PORTVERSION=	0.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/at-poke/pkg-plist b/accessibility/at-poke/pkg-plist
index c31eb298378c..173d9ca33033 100644
--- a/accessibility/at-poke/pkg-plist
+++ b/accessibility/at-poke/pkg-plist
@@ -1,3 +1,3 @@
 bin/at-poke
-share/gnome/at-poke/at-poke.glade2
-@dirrm share/gnome/at-poke
+share/at-poke/at-poke.glade2
+@dirrm share/at-poke
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index dde9bea839e8..c679cda4a1d7 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi/Makefile,v 1.56 2007/03/12 13:22:49 ahze Exp $
+#   $MCom: ports/accessibility/at-spi/Makefile,v 1.65 2007/10/15 17:22:02 mezz Exp $
 #
 
 PORTNAME=	at-spi
-PORTVERSION=	1.18.1
-PORTREVISION?=	1
+PORTVERSION=	1.20.1
+PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,14 +23,15 @@ USE_BZIP2=	yes
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intltool gail libbonobo \
+USE_GNOME=	gnomehack gnomehier intltool gail libbonobo \
 		intlhack
 USE_XLIB=	yes
+USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-extract:
 	@${RM} -f ${WRKSRC}/registryd/Accessibility_Registry.server
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index cd07c6f0306d..373f19b3d3ff 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.18.1.tar.bz2) = 46c531204df5d39f7e83822372b0ce69
-SHA256 (gnome2/at-spi-1.18.1.tar.bz2) = 3b0be3207eb5cf4b1c1666b1dcd341ac914802b5404defb812e3b2aa9e78e7aa
-SIZE (gnome2/at-spi-1.18.1.tar.bz2) = 780306
+MD5 (gnome2/at-spi-1.20.1.tar.bz2) = 9dc4ce96c17452cd285d006d03574e93
+SHA256 (gnome2/at-spi-1.20.1.tar.bz2) = d592833339a347d6e4b33946b717b7bbe61f7730d714112cd99715c5a3a3714e
+SIZE (gnome2/at-spi-1.20.1.tar.bz2) = 842254
diff --git a/accessibility/at-spi/files/patch-docs_reference_idl_Makefile.in b/accessibility/at-spi/files/patch-docs_reference_idl_Makefile.in
deleted file mode 100644
index f8b41ab8c214..000000000000
--- a/accessibility/at-spi/files/patch-docs_reference_idl_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/reference/idl/Makefile.in.orig	Fri Mar 31 17:43:05 2006
-+++ docs/reference/idl/Makefile.in	Fri Mar 31 17:43:28 2006
-@@ -233,7 +233,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- doxygen_configfile = Doxyfile
- EXTRA_DIST = Doxyfile README html
--referencetopdir = $(datadir)/doc/at-spi-$(VERSION)/reference
-+referencetopdir = $(prefix)/share/doc/at-spi-$(VERSION)/reference
- referencedir = $(referencetopdir)/html
- all: all-am
- 
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 74f5318c15a7..8d213686b51d 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -8,6 +8,7 @@ include/at-spi-1.0/libspi/accessible.h
 include/at-spi-1.0/libspi/action.h
 include/at-spi-1.0/libspi/application.h
 include/at-spi-1.0/libspi/base.h
+include/at-spi-1.0/libspi/collection.h
 include/at-spi-1.0/libspi/component.h
 include/at-spi-1.0/libspi/devicelistener.h
 include/at-spi-1.0/libspi/document.h
@@ -20,6 +21,7 @@ include/at-spi-1.0/libspi/keymasks.h
 include/at-spi-1.0/libspi/keystrokelistener.h
 include/at-spi-1.0/libspi/libspi.h
 include/at-spi-1.0/libspi/listener.h
+include/at-spi-1.0/libspi/matchrule.h
 include/at-spi-1.0/libspi/relation.h
 include/at-spi-1.0/libspi/remoteobject.h
 include/at-spi-1.0/libspi/selection.h
@@ -51,34 +53,53 @@ lib/orbit-2.0/Accessibility_LoginHelper_module.so
 lib/orbit-2.0/Accessibility_module.a
 lib/orbit-2.0/Accessibility_module.la
 lib/orbit-2.0/Accessibility_module.so
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.py
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/accessible.py
+%%PYTHON_SITELIBDIR%%/pyatspi/accessible.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/accessible.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.py
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/event.py
+%%PYTHON_SITELIBDIR%%/pyatspi/event.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/event.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.py
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.py
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.pyo
 libdata/bonobo/servers/Accessibility_Registry.server
 libdata/pkgconfig/cspi-1.0.pc
 libdata/pkgconfig/libloginhelper-1.0.pc
 libdata/pkgconfig/libspi-1.0.pc
 libexec/at-spi-registryd
-share/gnome/idl/at-spi-1.0/Accessibility.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Accessible.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Action.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Application.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Component.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Desktop.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Document.idl
-share/gnome/idl/at-spi-1.0/Accessibility_EditableText.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Event.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Hyperlink.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Hypertext.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Image.idl
-share/gnome/idl/at-spi-1.0/Accessibility_LoginHelper.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Registry.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Relation.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Role.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Selection.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Selector.idl
-share/gnome/idl/at-spi-1.0/Accessibility_State.idl
-share/gnome/idl/at-spi-1.0/Accessibility_StreamableContent.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Table.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Text.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Value.idl
+share/idl/at-spi-1.0/Accessibility.idl
+share/idl/at-spi-1.0/Accessibility_Accessible.idl
+share/idl/at-spi-1.0/Accessibility_Action.idl
+share/idl/at-spi-1.0/Accessibility_Application.idl
+share/idl/at-spi-1.0/Accessibility_Collection.idl
+share/idl/at-spi-1.0/Accessibility_Component.idl
+share/idl/at-spi-1.0/Accessibility_Desktop.idl
+share/idl/at-spi-1.0/Accessibility_Document.idl
+share/idl/at-spi-1.0/Accessibility_EditableText.idl
+share/idl/at-spi-1.0/Accessibility_Event.idl
+share/idl/at-spi-1.0/Accessibility_Hyperlink.idl
+share/idl/at-spi-1.0/Accessibility_Hypertext.idl
+share/idl/at-spi-1.0/Accessibility_Image.idl
+share/idl/at-spi-1.0/Accessibility_LoginHelper.idl
+share/idl/at-spi-1.0/Accessibility_Registry.idl
+share/idl/at-spi-1.0/Accessibility_Relation.idl
+share/idl/at-spi-1.0/Accessibility_Role.idl
+share/idl/at-spi-1.0/Accessibility_Selection.idl
+share/idl/at-spi-1.0/Accessibility_Selector.idl
+share/idl/at-spi-1.0/Accessibility_State.idl
+share/idl/at-spi-1.0/Accessibility_StreamableContent.idl
+share/idl/at-spi-1.0/Accessibility_Table.idl
+share/idl/at-spi-1.0/Accessibility_Text.idl
+share/idl/at-spi-1.0/Accessibility_Value.idl
 share/locale/ar/LC_MESSAGES/at-spi.mo
 share/locale/az/LC_MESSAGES/at-spi.mo
 share/locale/be/LC_MESSAGES/at-spi.mo
@@ -121,6 +142,7 @@ share/locale/nb/LC_MESSAGES/at-spi.mo
 share/locale/ne/LC_MESSAGES/at-spi.mo
 share/locale/nl/LC_MESSAGES/at-spi.mo
 share/locale/nn/LC_MESSAGES/at-spi.mo
+share/locale/oc/LC_MESSAGES/at-spi.mo
 share/locale/or/LC_MESSAGES/at-spi.mo
 share/locale/pa/LC_MESSAGES/at-spi.mo
 share/locale/pl/LC_MESSAGES/at-spi.mo
@@ -145,12 +167,13 @@ share/locale/xh/LC_MESSAGES/at-spi.mo
 share/locale/zh_CN/LC_MESSAGES/at-spi.mo
 share/locale/zh_HK/LC_MESSAGES/at-spi.mo
 share/locale/zh_TW/LC_MESSAGES/at-spi.mo
-@dirrm share/gnome/idl/at-spi-1.0
-@dirrmtry lib/orbit-2.0
+@dirrm share/idl/at-spi-1.0
+@dirrm %%PYTHON_SITELIBDIR%%/pyatspi
 @dirrm include/at-spi-1.0/login-helper
 @dirrm include/at-spi-1.0/libspi
 @dirrm include/at-spi-1.0/cspi
 @dirrm include/at-spi-1.0
+@dirrmtry lib/orbit-2.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -161,6 +184,8 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
 @dirrmtry share/locale/sr@ije
 @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/dz/LC_MESSAGES
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 0b552406fb5f..e128f52c1c3c 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.78 2007/03/12 13:28:58 ahze Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.85 2007/09/17 12:52:17 ahze Exp $
 #
 
 PORTNAME=	atk
-PORTVERSION=	1.18.0
-PORTREVISION?=	1
+PORTVERSION=	1.20.0
+PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 5fada467793e..4008bfaea678 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.18.0.tar.bz2) = 9fc33ec48fd32933f7f630479dfad667
-SHA256 (gnome2/atk-1.18.0.tar.bz2) = be2d537642a43b5a1e85a2d0f813167b8585781ff83203a4f68206c3ecd6a315
-SIZE (gnome2/atk-1.18.0.tar.bz2) = 655890
+MD5 (gnome2/atk-1.20.0.tar.bz2) = b1a9e28d9f54ea306bd85a4c84b25fb8
+SHA256 (gnome2/atk-1.20.0.tar.bz2) = 1f3b2f2cbb5b0d8da0924970c66c3ecbfe13c4e4360b0af1db7545401a3747c9
+SIZE (gnome2/atk-1.20.0.tar.bz2) = 705435
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index d83c44116415..1c7afa927b66 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -85,6 +85,7 @@ share/locale/nb/LC_MESSAGES/atk10.mo
 share/locale/ne/LC_MESSAGES/atk10.mo
 share/locale/nl/LC_MESSAGES/atk10.mo
 share/locale/nn/LC_MESSAGES/atk10.mo
+share/locale/oc/LC_MESSAGES/atk10.mo
 share/locale/or/LC_MESSAGES/atk10.mo
 share/locale/pa/LC_MESSAGES/atk10.mo
 share/locale/pl/LC_MESSAGES/atk10.mo
@@ -93,6 +94,7 @@ share/locale/pt_BR/LC_MESSAGES/atk10.mo
 share/locale/ro/LC_MESSAGES/atk10.mo
 share/locale/ru/LC_MESSAGES/atk10.mo
 share/locale/rw/LC_MESSAGES/atk10.mo
+share/locale/si/LC_MESSAGES/atk10.mo
 share/locale/sk/LC_MESSAGES/atk10.mo
 share/locale/sl/LC_MESSAGES/atk10.mo
 share/locale/sq/LC_MESSAGES/atk10.mo
@@ -131,8 +133,12 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
+@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/ku/LC_MESSAGES
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 0d99cba434e4..23f7fdc45427 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,11 +3,11 @@
 # Whom:					lewiz <purple@lewiz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/dasher/Makefile,v 1.50 2007/03/12 20:16:34 mezz Exp $
+#   $MCom: ports/accessibility/dasher/Makefile,v 1.59 2007/10/15 22:05:41 mezz Exp $
 #
 
 PORTNAME=	dasher
-PORTVERSION=	4.4.2
+PORTVERSION=	4.6.1
 PORTEPOCH=	1
 CATEGORIES=	accessibility editors x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -17,8 +17,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	lewiz@compsoc.man.ac.uk
 COMMENT=	Information efficient text-entry interface
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
+RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -39,14 +39,19 @@ MAN1=		dasher.1
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgnomespeech}!=""
-USE_GNOME+=	gnomespeech
-CONFIGURE_ARGS+=--enable-speech
-.endif
+#.if ${HAVE_GNOME:Mgnomespeech}!=""
+#USE_GNOME+=	gnomespeech
+#CONFIGURE_ARGS+=--enable-speech
+#.endif
+CONFIGURE_ARGS+=	--disable-speech
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-O2||g'
+.if ${OSVERSION} >= 700042
+	@${REINPLACE_CMD} -e 's|__gnu_cxx::lldiv|lldiv|' \
+	    	${WRKSRC}/Src/DasherCore/DasherViewSquare.cpp
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index fb160165d4fd..98ee68b55eb7 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-4.4.2.tar.bz2) = ca50a357d5043e4e5f114ecda7cd1c73
-SHA256 (gnome2/dasher-4.4.2.tar.bz2) = 0ee0d5e7f867bd21f0ab13dcd72dd2dd7eb6bb0d7918c18971ece81d3c2a76ed
-SIZE (gnome2/dasher-4.4.2.tar.bz2) = 6880246
+MD5 (gnome2/dasher-4.6.1.tar.bz2) = 1457df5075477d757f7df5693947464d
+SHA256 (gnome2/dasher-4.6.1.tar.bz2) = 3f0ee0a37465f5262937e8d2746bf7710cc6505e704e80c318dc3e01806aebc8
+SIZE (gnome2/dasher-4.6.1.tar.bz2) = 6473483
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp
deleted file mode 100644
index baf470649d47..000000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/DasherCore/BasicLog.cpp.orig	Tue Dec  5 22:01:38 2006
-+++ Src/DasherCore/BasicLog.cpp	Tue Dec  5 22:02:14 2006
-@@ -87,7 +87,7 @@ std::string CBasicLog::GetDateStamp() {
-     szTimeLine = ctime(&(sTimeBuffer.time));
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
-+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- #endif
- 
-     return std::string(szTimeLine).substr(0, 24);
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
deleted file mode 100644
index ec71875602fd..000000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/DasherCore/FileLogger.cpp.orig	Sun Dec  3 09:50:34 2006
-+++ Src/DasherCore/FileLogger.cpp	Sun Dec  3 18:45:55 2006
-@@ -511,7 +511,7 @@ std::string CFileLogger::GetTimeDateStam
-     szTimeLine = ctime(&(sTimeBuffer.time));
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
-+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- #endif
-  
-     // Format is:
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
deleted file mode 100644
index 745c41f85a5e..000000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- Src/DasherCore/SimpleTimer.cpp.orig	Wed May 31 00:14:12 2006
-+++ Src/DasherCore/SimpleTimer.cpp	Wed May 31 00:14:23 2006
-@@ -34,8 +34,8 @@ CSimpleTimer::CSimpleTimer()
-     m_iStartSecond   = sTimeBuffer.time;
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    m_iStartMs       = sTimeBuffer.tv_usec / 1000;
--    m_iStartSecond   = sTimeBuffer.tv_sec;
-+    m_iStartMs       = (int) sTimeBuffer.tv_usec / 1000;
-+    m_iStartSecond   = (int) sTimeBuffer.tv_sec;
- #endif
- 
- }
-@@ -59,8 +59,8 @@ double CSimpleTimer::GetElapsed()
-   int     iEndSecond   = sTimeBuffer.time;
- #else
-   gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--  int     iEndMs       = sTimeBuffer.tv_usec / 1000;
--  int     iEndSecond   = sTimeBuffer.tv_sec;
-+  int     iEndMs       = (int) sTimeBuffer.tv_usec / 1000;
-+  int     iEndSecond   = (int) sTimeBuffer.tv_sec;
- #endif
- 
- 
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
deleted file mode 100644
index c10219ff4f4f..000000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- Src/DasherCore/TimeSpan.cpp.orig	Sun Dec  3 09:50:34 2006
-+++ Src/DasherCore/TimeSpan.cpp	Sun Dec  3 18:47:02 2006
-@@ -122,7 +122,7 @@ string CTimeSpan::GetTimeStamp()
-     szTimeLine = ctime(&(sTimeBuffer.time));
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
-+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- #endif
-   
-   if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-@@ -196,7 +196,7 @@ string CTimeSpan::GetDateStamp()
-     szTimeLine = ctime(&(sTimeBuffer.time));
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
-+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- #endif
- 
-  
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
deleted file mode 100644
index 663e5426ef34..000000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- Src/DasherCore/UserLog.cpp.orig	Fri Apr 21 17:41:02 2006
-+++ Src/DasherCore/UserLog.cpp	Sun Jun 11 10:43:33 2006
-@@ -668,7 +668,7 @@
-     szTimeLine = ctime(&(sTimeBuffer.time));
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
-+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- #endif
- 
-     if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-@@ -881,7 +881,7 @@
-   double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm;
- #else
-   gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--  double dTime = (sTimeBuffer.tv_sec * 1000.0) + sTimeBuffer.tv_usec / 1000;
-+  double dTime = (sTimeBuffer.tv_sec * 1000.0) + (int) (sTimeBuffer.tv_usec / 1000);
- #endif
- 
-   
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index ef7a17014da2..6e65094162d8 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -1,185 +1,188 @@
 bin/dasher
-share/gnome/applications/dasher.desktop
-share/gnome/dasher/alphabet.AfaanOromo.xml
-share/gnome/dasher/alphabet.Armenian.xml
-share/gnome/dasher/alphabet.Assamese.xml
-share/gnome/dasher/alphabet.Azerbaijani.xml
-share/gnome/dasher/alphabet.Belarusian.xml
-share/gnome/dasher/alphabet.Bulgarian.xml
-share/gnome/dasher/alphabet.Esperanto.xml
-share/gnome/dasher/alphabet.Estonian.xml
-share/gnome/dasher/alphabet.Filipino.xml
-share/gnome/dasher/alphabet.Greek.xml
-share/gnome/dasher/alphabet.Gujarati.xml
-share/gnome/dasher/alphabet.Hawaiian.xml
-share/gnome/dasher/alphabet.Hebrew.xml
-share/gnome/dasher/alphabet.Hindi.xml
-share/gnome/dasher/alphabet.Icelandic.xml
-share/gnome/dasher/alphabet.Igbo.xml
-share/gnome/dasher/alphabet.Indonesian.xml
-share/gnome/dasher/alphabet.IrishGaelic.xml
-share/gnome/dasher/alphabet.Kannada.xml
-share/gnome/dasher/alphabet.Katakana.xml
-share/gnome/dasher/alphabet.Malay.xml
-share/gnome/dasher/alphabet.Malayalam.xml
-share/gnome/dasher/alphabet.Marathi.xml
-share/gnome/dasher/alphabet.Moldavian.xml
-share/gnome/dasher/alphabet.Ndebele.xml
-share/gnome/dasher/alphabet.Oriya.xml
-share/gnome/dasher/alphabet.Punjabi.xml
-share/gnome/dasher/alphabet.Romanian.xml
-share/gnome/dasher/alphabet.Sami.xml
-share/gnome/dasher/alphabet.ScotsGaelic.xml
-share/gnome/dasher/alphabet.Sepedi.xml
-share/gnome/dasher/alphabet.Sesotho.xml
-share/gnome/dasher/alphabet.Sinhala.xml
-share/gnome/dasher/alphabet.Slovak.xml
-share/gnome/dasher/alphabet.Slovenian.xml
-share/gnome/dasher/alphabet.Swati.xml
-share/gnome/dasher/alphabet.Tajik.xml
-share/gnome/dasher/alphabet.Tamil.xml
-share/gnome/dasher/alphabet.Telugu.xml
-share/gnome/dasher/alphabet.Thai.xml
-share/gnome/dasher/alphabet.Thai2.xml
-share/gnome/dasher/alphabet.Tsonga.xml
-share/gnome/dasher/alphabet.Tswana.xml
-share/gnome/dasher/alphabet.Turkish.xml
-share/gnome/dasher/alphabet.Urdu.xml
-share/gnome/dasher/alphabet.Vietnamese.xml
-share/gnome/dasher/alphabet.Xhosa.xml
-share/gnome/dasher/alphabet.Yoruba.xml
-share/gnome/dasher/alphabet.Zulu.xml
-share/gnome/dasher/alphabet.abc.xml
-share/gnome/dasher/alphabet.adangbe.xml
-share/gnome/dasher/alphabet.afrikaans.xml
-share/gnome/dasher/alphabet.akan.xml
-share/gnome/dasher/alphabet.albanian.xml
-share/gnome/dasher/alphabet.amharic.xml
-share/gnome/dasher/alphabet.arabic.xml
-share/gnome/dasher/alphabet.basque.xml
-share/gnome/dasher/alphabet.bengali.xml
-share/gnome/dasher/alphabet.bopomofo.xml
-share/gnome/dasher/alphabet.bosnian.xml
-share/gnome/dasher/alphabet.breton.xml
-share/gnome/dasher/alphabet.catalan.xml
-share/gnome/dasher/alphabet.cherokee.xml
-share/gnome/dasher/alphabet.chinese.xml
-share/gnome/dasher/alphabet.chineseRuby.xml
-share/gnome/dasher/alphabet.corsican.xml
-share/gnome/dasher/alphabet.croatian.xml
-share/gnome/dasher/alphabet.czech.xml
-share/gnome/dasher/alphabet.danish.xml
-share/gnome/dasher/alphabet.dtd
-share/gnome/dasher/alphabet.dutch.xml
-share/gnome/dasher/alphabet.english.xml
-share/gnome/dasher/alphabet.englishC.xml
-share/gnome/dasher/alphabet.ethiopic.xml
-share/gnome/dasher/alphabet.ewe.xml
-share/gnome/dasher/alphabet.faroese.xml
-share/gnome/dasher/alphabet.finnish.xml
-share/gnome/dasher/alphabet.finnish2.xml
-share/gnome/dasher/alphabet.french.xml
-share/gnome/dasher/alphabet.ga.xml
-share/gnome/dasher/alphabet.galician.xml
-share/gnome/dasher/alphabet.georgian.xml
-share/gnome/dasher/alphabet.german.xml
-share/gnome/dasher/alphabet.hausa.xml
-share/gnome/dasher/alphabet.hiragana.xml
-share/gnome/dasher/alphabet.hiragana2.xml
-share/gnome/dasher/alphabet.hungarian.xml
-share/gnome/dasher/alphabet.ipa.xml
-share/gnome/dasher/alphabet.italian.xml
-share/gnome/dasher/alphabet.japanese.canna.xml
-share/gnome/dasher/alphabet.kazakh.xml
-share/gnome/dasher/alphabet.kirghiz.xml
-share/gnome/dasher/alphabet.kirundi.xml
-share/gnome/dasher/alphabet.klingon.xml
-share/gnome/dasher/alphabet.korean.xml
-share/gnome/dasher/alphabet.koreanNested.xml
-share/gnome/dasher/alphabet.kurdish.xml
-share/gnome/dasher/alphabet.lao.xml
-share/gnome/dasher/alphabet.latex.xml
-share/gnome/dasher/alphabet.latin.xml
-share/gnome/dasher/alphabet.latvian.xml
-share/gnome/dasher/alphabet.lithuanian.xml
-share/gnome/dasher/alphabet.luxembourgish.xml
-share/gnome/dasher/alphabet.macedonian.xml
-share/gnome/dasher/alphabet.malagasy.xml
-share/gnome/dasher/alphabet.maltese.xml
-share/gnome/dasher/alphabet.mongolian.xml
-share/gnome/dasher/alphabet.myanmar.xml
-share/gnome/dasher/alphabet.nepali.xml
-share/gnome/dasher/alphabet.norwegian.xml
-share/gnome/dasher/alphabet.occitan.xml
-share/gnome/dasher/alphabet.ogham.xml
-share/gnome/dasher/alphabet.pashto.xml
-share/gnome/dasher/alphabet.persian.xml
-share/gnome/dasher/alphabet.pinyin.xml
-share/gnome/dasher/alphabet.polish.xml
-share/gnome/dasher/alphabet.portuguese.xml
-share/gnome/dasher/alphabet.romansch.xml
-share/gnome/dasher/alphabet.runic.xml
-share/gnome/dasher/alphabet.russian.xml
-share/gnome/dasher/alphabet.sanskrit.xml
-share/gnome/dasher/alphabet.serbian.xml
-share/gnome/dasher/alphabet.somali.xml
-share/gnome/dasher/alphabet.spanish.xml
-share/gnome/dasher/alphabet.swahili.xml
-share/gnome/dasher/alphabet.swedish.xml
-share/gnome/dasher/alphabet.thaana.xml
-share/gnome/dasher/alphabet.tigrinya.xml
-share/gnome/dasher/alphabet.turkmen.xml
-share/gnome/dasher/alphabet.ukrainian.xml
-share/gnome/dasher/alphabet.uzbek.xml
-share/gnome/dasher/alphabet.venda.xml
-share/gnome/dasher/alphabet.welsh.xml
-share/gnome/dasher/alphabet.xsl
-share/gnome/dasher/colour.blue.xml
-share/gnome/dasher/colour.dtd
-share/gnome/dasher/colour.euroasian.xml
-share/gnome/dasher/colour.euroasian2.xml
-share/gnome/dasher/colour.euroasian3.xml
-share/gnome/dasher/colour.jamie.xml
-share/gnome/dasher/colour.rainbow.xml
-share/gnome/dasher/colour.thai.xml
-share/gnome/dasher/colour.vowels.xml
-share/gnome/dasher/colour.vowels2.xml
-share/gnome/dasher/colour.xml
-share/gnome/dasher/controllabels.dtd
-share/gnome/dasher/controllabels.xml
-share/gnome/dasher/dasher.compose.glade
-share/gnome/dasher/dasher.direct.glade
-share/gnome/dasher/dasher.fullscreen.glade
-share/gnome/dasher/dasher.traditional.glade
-share/gnome/dasher/dashermaemo.glade
-share/gnome/dasher/dashermaemofullscreen.glade
-share/gnome/dasher/training_albanian_SQ.txt
-share/gnome/dasher/training_basque_EU.txt
-share/gnome/dasher/training_bengali_BD.txt
-share/gnome/dasher/training_canna_JP.txt
-share/gnome/dasher/training_czech_CS.txt
-share/gnome/dasher/training_danish_DK.txt
-share/gnome/dasher/training_dutch_NL.txt
-share/gnome/dasher/training_english_GB.txt
-share/gnome/dasher/training_finnish_FI.txt
-share/gnome/dasher/training_french_FR.txt
-share/gnome/dasher/training_german_DE.txt
-share/gnome/dasher/training_greek_GR.txt
-share/gnome/dasher/training_hebrew_IL.txt
-share/gnome/dasher/training_hiragana60_JP.txt
-share/gnome/dasher/training_hiragana83_JP.txt
-share/gnome/dasher/training_hungarian_HU.txt
-share/gnome/dasher/training_italian_IT.txt
-share/gnome/dasher/training_mongolian_MN.txt
-share/gnome/dasher/training_persian_IR.txt
-share/gnome/dasher/training_polish_PL.txt
-share/gnome/dasher/training_portuguese_BR.txt
-share/gnome/dasher/training_russian_RU.txt
-share/gnome/dasher/training_spanish_ES.txt
-share/gnome/dasher/training_swahili_KE.txt
-share/gnome/dasher/training_swedish_SE.txt
-share/gnome/dasher/training_turkish_TR.txt
-share/gnome/dasher/training_welsh_GB.txt
+share/applications/dasher.desktop
+%%DATADIR%%/alphabet.AfaanOromo.xml
+%%DATADIR%%/alphabet.Armenian.xml
+%%DATADIR%%/alphabet.Assamese.xml
+%%DATADIR%%/alphabet.Austen.xml
+%%DATADIR%%/alphabet.Azerbaijani.xml
+%%DATADIR%%/alphabet.Belarusian.xml
+%%DATADIR%%/alphabet.Bulgarian.xml
+%%DATADIR%%/alphabet.Esperanto.xml
+%%DATADIR%%/alphabet.Estonian.xml
+%%DATADIR%%/alphabet.Filipino.xml
+%%DATADIR%%/alphabet.Greek.xml
+%%DATADIR%%/alphabet.Gujarati.xml
+%%DATADIR%%/alphabet.Hawaiian.xml
+%%DATADIR%%/alphabet.Hebrew.xml
+%%DATADIR%%/alphabet.Hindi.xml
+%%DATADIR%%/alphabet.Icelandic.xml
+%%DATADIR%%/alphabet.Igbo.xml
+%%DATADIR%%/alphabet.Indonesian.xml
+%%DATADIR%%/alphabet.IrishGaelic.xml
+%%DATADIR%%/alphabet.Kannada.xml
+%%DATADIR%%/alphabet.Katakana.xml
+%%DATADIR%%/alphabet.Malay.xml
+%%DATADIR%%/alphabet.Malayalam.xml
+%%DATADIR%%/alphabet.Marathi.xml
+%%DATADIR%%/alphabet.Moldavian.xml
+%%DATADIR%%/alphabet.Ndebele.xml
+%%DATADIR%%/alphabet.Oriya.xml
+%%DATADIR%%/alphabet.Punjabi.xml
+%%DATADIR%%/alphabet.Romanian.xml
+%%DATADIR%%/alphabet.Sami.xml
+%%DATADIR%%/alphabet.ScotsGaelic.xml
+%%DATADIR%%/alphabet.Sepedi.xml
+%%DATADIR%%/alphabet.Sesotho.xml
+%%DATADIR%%/alphabet.Sinhala.xml
+%%DATADIR%%/alphabet.Slovak.xml
+%%DATADIR%%/alphabet.Slovenian.xml
+%%DATADIR%%/alphabet.Swati.xml
+%%DATADIR%%/alphabet.Tajik.xml
+%%DATADIR%%/alphabet.Tamil.xml
+%%DATADIR%%/alphabet.Telugu.xml
+%%DATADIR%%/alphabet.Thai.xml
+%%DATADIR%%/alphabet.Thai2.xml
+%%DATADIR%%/alphabet.Tsonga.xml
+%%DATADIR%%/alphabet.Tswana.xml
+%%DATADIR%%/alphabet.Turkish.xml
+%%DATADIR%%/alphabet.Urdu.xml
+%%DATADIR%%/alphabet.Vietnamese.xml
+%%DATADIR%%/alphabet.Xhosa.xml
+%%DATADIR%%/alphabet.Yoruba.xml
+%%DATADIR%%/alphabet.Zulu.xml
+%%DATADIR%%/alphabet.abc.xml
+%%DATADIR%%/alphabet.adangbe.xml
+%%DATADIR%%/alphabet.afrikaans.xml
+%%DATADIR%%/alphabet.akan.xml
+%%DATADIR%%/alphabet.albanian.xml
+%%DATADIR%%/alphabet.amharic.xml
+%%DATADIR%%/alphabet.arabic.xml
+%%DATADIR%%/alphabet.basque.xml
+%%DATADIR%%/alphabet.bengali.xml
+%%DATADIR%%/alphabet.bopomofo.xml
+%%DATADIR%%/alphabet.bosnian.xml
+%%DATADIR%%/alphabet.breton.xml
+%%DATADIR%%/alphabet.catalan.xml
+%%DATADIR%%/alphabet.cherokee.xml
+%%DATADIR%%/alphabet.chinese.xml
+%%DATADIR%%/alphabet.chineseRuby.xml
+%%DATADIR%%/alphabet.corsican.xml
+%%DATADIR%%/alphabet.croatian.xml
+%%DATADIR%%/alphabet.czech.xml
+%%DATADIR%%/alphabet.danish.xml
+%%DATADIR%%/alphabet.dtd
+%%DATADIR%%/alphabet.dutch.xml
+%%DATADIR%%/alphabet.english.xml
+%%DATADIR%%/alphabet.englishC.xml
+%%DATADIR%%/alphabet.ethiopic.xml
+%%DATADIR%%/alphabet.ewe.xml
+%%DATADIR%%/alphabet.faroese.xml
+%%DATADIR%%/alphabet.finnish.xml
+%%DATADIR%%/alphabet.finnish2.xml
+%%DATADIR%%/alphabet.french.xml
+%%DATADIR%%/alphabet.ga.xml
+%%DATADIR%%/alphabet.galician.xml
+%%DATADIR%%/alphabet.georgian.xml
+%%DATADIR%%/alphabet.german.xml
+%%DATADIR%%/alphabet.hausa.xml
+%%DATADIR%%/alphabet.hiragana.xml
+%%DATADIR%%/alphabet.hiragana2.xml
+%%DATADIR%%/alphabet.hungarian.xml
+%%DATADIR%%/alphabet.ipa.xml
+%%DATADIR%%/alphabet.italian.xml
+%%DATADIR%%/alphabet.japanese.canna.xml
+%%DATADIR%%/alphabet.kazakh.xml
+%%DATADIR%%/alphabet.kirghiz.xml
+%%DATADIR%%/alphabet.kirundi.xml
+%%DATADIR%%/alphabet.klingon.xml
+%%DATADIR%%/alphabet.korean.xml
+%%DATADIR%%/alphabet.koreanNested.xml
+%%DATADIR%%/alphabet.kurdish.xml
+%%DATADIR%%/alphabet.lao.xml
+%%DATADIR%%/alphabet.latex.xml
+%%DATADIR%%/alphabet.latin.xml
+%%DATADIR%%/alphabet.latvian.xml
+%%DATADIR%%/alphabet.lithuanian.xml
+%%DATADIR%%/alphabet.luxembourgish.xml
+%%DATADIR%%/alphabet.macedonian.xml
+%%DATADIR%%/alphabet.maltese.xml
+%%DATADIR%%/alphabet.mongolian.xml
+%%DATADIR%%/alphabet.myanmar.xml
+%%DATADIR%%/alphabet.nepali.xml
+%%DATADIR%%/alphabet.norwegian.xml
+%%DATADIR%%/alphabet.occitan.xml
+%%DATADIR%%/alphabet.ogham.xml
+%%DATADIR%%/alphabet.pashto.xml
+%%DATADIR%%/alphabet.perl.xml
+%%DATADIR%%/alphabet.persian.xml
+%%DATADIR%%/alphabet.pinyin.xml
+%%DATADIR%%/alphabet.pinyin2.xml
+%%DATADIR%%/alphabet.polish.xml
+%%DATADIR%%/alphabet.portuguese.xml
+%%DATADIR%%/alphabet.romansch.xml
+%%DATADIR%%/alphabet.runic.xml
+%%DATADIR%%/alphabet.russian.xml
+%%DATADIR%%/alphabet.sanskrit.xml
+%%DATADIR%%/alphabet.serbian.xml
+%%DATADIR%%/alphabet.somali.xml
+%%DATADIR%%/alphabet.spanish.xml
+%%DATADIR%%/alphabet.swahili.xml
+%%DATADIR%%/alphabet.swedish.xml
+%%DATADIR%%/alphabet.thaana.xml
+%%DATADIR%%/alphabet.tigrinya.xml
+%%DATADIR%%/alphabet.turkmen.xml
+%%DATADIR%%/alphabet.ukrainian.xml
+%%DATADIR%%/alphabet.uzbek.xml
+%%DATADIR%%/alphabet.venda.xml
+%%DATADIR%%/alphabet.welsh.xml
+%%DATADIR%%/alphabet.xsl
+%%DATADIR%%/colour.blue.xml
+%%DATADIR%%/colour.dtd
+%%DATADIR%%/colour.euroasian.xml
+%%DATADIR%%/colour.euroasian2.xml
+%%DATADIR%%/colour.euroasian3.xml
+%%DATADIR%%/colour.jamie.xml
+%%DATADIR%%/colour.rainbow.xml
+%%DATADIR%%/colour.thai.xml
+%%DATADIR%%/colour.vowels.xml
+%%DATADIR%%/colour.vowels2.xml
+%%DATADIR%%/colour.xml
+%%DATADIR%%/controllabels.dtd
+%%DATADIR%%/controllabels.xml
+%%DATADIR%%/dasher.compose.glade
+%%DATADIR%%/dasher.direct.glade
+%%DATADIR%%/dasher.fullscreen.glade
+%%DATADIR%%/dasher.traditional.glade
+%%DATADIR%%/dashermaemo.glade
+%%DATADIR%%/dashermaemofullscreen.glade
+%%DATADIR%%/training_albanian_SQ.txt
+%%DATADIR%%/training_basque_EU.txt
+%%DATADIR%%/training_bengali_BD.txt
+%%DATADIR%%/training_bengali_bn.txt
+%%DATADIR%%/training_canna_JP.txt
+%%DATADIR%%/training_czech_CS.txt
+%%DATADIR%%/training_danish_DK.txt
+%%DATADIR%%/training_dutch_NL.txt
+%%DATADIR%%/training_english_GB.txt
+%%DATADIR%%/training_finnish_FI.txt
+%%DATADIR%%/training_french_FR.txt
+%%DATADIR%%/training_german_DE.txt
+%%DATADIR%%/training_greek_GR.txt
+%%DATADIR%%/training_hebrew_IL.txt
+%%DATADIR%%/training_hiragana60_JP.txt
+%%DATADIR%%/training_hiragana83_JP.txt
+%%DATADIR%%/training_hungarian_HU.txt
+%%DATADIR%%/training_italian_IT.txt
+%%DATADIR%%/training_mongolian_MN.txt
+%%DATADIR%%/training_persian_IR.txt
+%%DATADIR%%/training_polish_PL.txt
+%%DATADIR%%/training_portuguese_BR.txt
+%%DATADIR%%/training_russian_RU.txt
+%%DATADIR%%/training_spanish_ES.txt
+%%DATADIR%%/training_swahili_KE.txt
+%%DATADIR%%/training_swedish_SE.txt
+%%DATADIR%%/training_turkish_TR.txt
+%%DATADIR%%/training_welsh_GB.txt
 share/gnome/help/dasher/C/dasher.xml
 share/gnome/help/dasher/C/figures/a-z.gif
 share/gnome/help/dasher/C/figures/aa-az.gif
@@ -228,6 +231,22 @@ share/gnome/help/dasher/fr/figures/prefs2.png
 share/gnome/help/dasher/fr/figures/prefs3.png
 share/gnome/help/dasher/fr/figures/prefs4.png
 share/gnome/help/dasher/fr/figures/prefs5.png
+share/gnome/help/dasher/ru/dasher.xml
+share/gnome/help/dasher/ru/figures/a-z.gif
+share/gnome/help/dasher/ru/figures/aa-az.gif
+share/gnome/help/dasher/ru/figures/ala-alz.gif
+share/gnome/help/dasher/ru/figures/exampleHad2.png
+share/gnome/help/dasher/ru/figures/exampleHad2a.png
+share/gnome/help/dasher/ru/figures/exampleHad3a.png
+share/gnome/help/dasher/ru/figures/exampleHad4.png
+share/gnome/help/dasher/ru/figures/figure2.png
+share/gnome/help/dasher/ru/figures/main.png
+share/gnome/help/dasher/ru/figures/object.gif
+share/gnome/help/dasher/ru/figures/prefs1.png
+share/gnome/help/dasher/ru/figures/prefs2.png
+share/gnome/help/dasher/ru/figures/prefs3.png
+share/gnome/help/dasher/ru/figures/prefs4.png
+share/gnome/help/dasher/ru/figures/prefs5.png
 share/gnome/help/dasher/sv/dasher.xml
 share/gnome/help/dasher/sv/figures/a-z.gif
 share/gnome/help/dasher/sv/figures/aa-az.gif
@@ -244,15 +263,12 @@ share/gnome/help/dasher/sv/figures/prefs2.png
 share/gnome/help/dasher/sv/figures/prefs3.png
 share/gnome/help/dasher/sv/figures/prefs4.png
 share/gnome/help/dasher/sv/figures/prefs5.png
-share/gnome/omf/dasher/dasher-C.omf
-share/gnome/omf/dasher/dasher-es.omf
-share/gnome/omf/dasher/dasher-fr.omf
-share/gnome/omf/dasher/dasher-sv.omf
 share/icons/hicolor/48x48/apps/dasher.png
 share/icons/hicolor/scalable/apps/dasher.svg
 share/locale/ar/LC_MESSAGES/dasher.mo
 share/locale/az/LC_MESSAGES/dasher.mo
 share/locale/be/LC_MESSAGES/dasher.mo
+share/locale/be@latin/LC_MESSAGES/dasher.mo
 share/locale/bg/LC_MESSAGES/dasher.mo
 share/locale/bn/LC_MESSAGES/dasher.mo
 share/locale/bn_IN/LC_MESSAGES/dasher.mo
@@ -298,6 +314,7 @@ share/locale/nb/LC_MESSAGES/dasher.mo
 share/locale/ne/LC_MESSAGES/dasher.mo
 share/locale/nl/LC_MESSAGES/dasher.mo
 share/locale/nn/LC_MESSAGES/dasher.mo
+share/locale/oc/LC_MESSAGES/dasher.mo
 share/locale/or/LC_MESSAGES/dasher.mo
 share/locale/pa/LC_MESSAGES/dasher.mo
 share/locale/pl/LC_MESSAGES/dasher.mo
@@ -306,6 +323,7 @@ share/locale/pt_BR/LC_MESSAGES/dasher.mo
 share/locale/ro/LC_MESSAGES/dasher.mo
 share/locale/ru/LC_MESSAGES/dasher.mo
 share/locale/rw/LC_MESSAGES/dasher.mo
+share/locale/si/LC_MESSAGES/dasher.mo
 share/locale/sk/LC_MESSAGES/dasher.mo
 share/locale/sl/LC_MESSAGES/dasher.mo
 share/locale/sq/LC_MESSAGES/dasher.mo
@@ -318,13 +336,21 @@ share/locale/tk/LC_MESSAGES/dasher.mo
 share/locale/tr/LC_MESSAGES/dasher.mo
 share/locale/ug/LC_MESSAGES/dasher.mo
 share/locale/uk/LC_MESSAGES/dasher.mo
+share/locale/uz@cyrillic/LC_MESSAGES/dasher.mo
 share/locale/vi/LC_MESSAGES/dasher.mo
 share/locale/zh_CN/LC_MESSAGES/dasher.mo
 share/locale/zh_HK/LC_MESSAGES/dasher.mo
 share/locale/zh_TW/LC_MESSAGES/dasher.mo
-@dirrm share/gnome/omf/dasher
+share/omf/dasher/dasher-C.omf
+share/omf/dasher/dasher-es.omf
+share/omf/dasher/dasher-fr.omf
+share/omf/dasher/dasher-ru.omf
+share/omf/dasher/dasher-sv.omf
+@dirrm share/omf/dasher
 @dirrm share/gnome/help/dasher/sv/figures
 @dirrm share/gnome/help/dasher/sv
+@dirrm share/gnome/help/dasher/ru/figures
+@dirrm share/gnome/help/dasher/ru
 @dirrm share/gnome/help/dasher/fr/figures
 @dirrm share/gnome/help/dasher/fr
 @dirrm share/gnome/help/dasher/es/figures
@@ -332,13 +358,19 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
 @dirrm share/gnome/help/dasher/C/figures
 @dirrm share/gnome/help/dasher/C
 @dirrm share/gnome/help/dasher
-@dirrm share/gnome/dasher
+@dirrm %%DATADIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@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/mg/LC_MESSAGES
@@ -351,3 +383,6 @@ share/locale/zh_TW/LC_MESSAGES/dasher.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
+@dirrmtry share/applications
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 578da3a4fa56..1631f6de61c0 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/gail/Makefile,v 1.57 2007/03/12 13:34:38 ahze Exp $
+#   $MCom: ports/accessibility/gail/Makefile,v 1.67 2007/10/15 13:36:14 ahze Exp $
 #
 
 PORTNAME=	gail
-PORTVERSION=	1.18.0
-PORTREVISION?=	1
+PORTVERSION=	1.20.1
+PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -26,7 +26,7 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomehack ltverhack libgnomecanvas lthack referencehack
+USE_GNOME=	gnomehack ltverhack gtk20 lthack referencehack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-gtk-doc \
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index 302d99f1fc6d..f92553fad869 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gail-1.18.0.tar.bz2) = d58ad8cc79d3cb6778bc015ef69fb499
-SHA256 (gnome2/gail-1.18.0.tar.bz2) = 1a047f1aa43ad455baff1e9a0abf94c957c42490d365ffde19707d0f039a9705
-SIZE (gnome2/gail-1.18.0.tar.bz2) = 610187
+MD5 (gnome2/gail-1.20.1.tar.bz2) = 3925b85849c720d4768682ff4eab1c58
+SHA256 (gnome2/gail-1.20.1.tar.bz2) = 9fa0cbb8f2a7689b2eb7f6e5545f842496ad9eb7c0464629f7054bcf121a4c59
+SIZE (gnome2/gail-1.20.1.tar.bz2) = 658769
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index ab76b02e098f..6ae9531d56a8 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -60,6 +60,7 @@ share/locale/nb/LC_MESSAGES/gail.mo
 share/locale/ne/LC_MESSAGES/gail.mo
 share/locale/nl/LC_MESSAGES/gail.mo
 share/locale/nn/LC_MESSAGES/gail.mo
+share/locale/oc/LC_MESSAGES/gail.mo
 share/locale/or/LC_MESSAGES/gail.mo
 share/locale/pa/LC_MESSAGES/gail.mo
 share/locale/pl/LC_MESSAGES/gail.mo
@@ -75,6 +76,7 @@ share/locale/sr/LC_MESSAGES/gail.mo
 share/locale/sr@Latn/LC_MESSAGES/gail.mo
 share/locale/sv/LC_MESSAGES/gail.mo
 share/locale/ta/LC_MESSAGES/gail.mo
+share/locale/te/LC_MESSAGES/gail.mo
 share/locale/th/LC_MESSAGES/gail.mo
 share/locale/tk/LC_MESSAGES/gail.mo
 share/locale/tr/LC_MESSAGES/gail.mo
@@ -84,15 +86,19 @@ share/locale/xh/LC_MESSAGES/gail.mo
 share/locale/zh_CN/LC_MESSAGES/gail.mo
 share/locale/zh_HK/LC_MESSAGES/gail.mo
 share/locale/zh_TW/LC_MESSAGES/gail.mo
-@dirrm include/gail-1.0/gail
 @dirrm include/gail-1.0/libgail-util
+@dirrm include/gail-1.0/gail
 @dirrm include/gail-1.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @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/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/mg/LC_MESSAGES
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index e59d82b8d760..be0bfad94eec 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.27 2007/03/11 06:58:01 marcus Exp $
+#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.37 2007/09/17 16:05:19 ahze Exp $
 #
 
 PORTNAME=	gnome-mag
-PORTVERSION=	0.14.4
+PORTVERSION=	0.14.10
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,8 +23,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 DOCSDIR=	${PREFIX}/share/doc/gnome-mag-${PORTVERSION}
 
diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo
index b8791627a169..4b5b1aa2692b 100644
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-mag-0.14.4.tar.bz2) = 1e7a2259bc241e77a3959dd438d41777
-SHA256 (gnome2/gnome-mag-0.14.4.tar.bz2) = 0df7a60eb65f25c24eff505f0573a536df92a86680490bb45a067d053ec7d5f4
-SIZE (gnome2/gnome-mag-0.14.4.tar.bz2) = 796260
+MD5 (gnome2/gnome-mag-0.14.10.tar.bz2) = e3e498c7df873ecc7acabd52a7b4ddc7
+SHA256 (gnome2/gnome-mag-0.14.10.tar.bz2) = d610d637bd6006f2831f751a25ed77c371fcfebbe06104968524d5b78f3a155c
+SIZE (gnome2/gnome-mag-0.14.10.tar.bz2) = 505530
diff --git a/accessibility/gnome-mag/files/patch-docs_reference_Makefile.in b/accessibility/gnome-mag/files/patch-docs_reference_Makefile.in
deleted file mode 100644
index 7f8016433ddf..000000000000
--- a/accessibility/gnome-mag/files/patch-docs_reference_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/reference/Makefile.in.orig	Fri Feb  3 00:25:58 2006
-+++ docs/reference/Makefile.in	Fri Feb  3 00:26:09 2006
-@@ -220,7 +220,7 @@
- target_alias = @target_alias@
- doxygen_configfile = Doxyfile
- EXTRA_DIST = README Doxyfile html
--referencetopdir = $(datadir)/doc/gnome-mag-$(VERSION)/reference
-+referencetopdir = $(prefix)/share/doc/gnome-mag-$(VERSION)/reference
- referencedir = $(referencetopdir)/html
- all: all-am
- 
diff --git a/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c b/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c
deleted file mode 100644
index b8ab206a3dad..000000000000
--- a/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- magnifier/zoom-region.c~	Tue Feb 14 22:37:24 2006
-+++ magnifier/zoom-region.c	Thu Mar 16 15:36:55 2006
-@@ -1794,10 +1794,10 @@
- 		gdk_window_end_paint (zoom_region->priv->w->window);
- 		g_timer_stop (mag_timing.scale);
- 		if (timing_test) {
--			mag_timing.num_scale_samples++;
--			
- 			gulong microseconds;
- 
-+			mag_timing.num_scale_samples++;
-+
- 			mag_timing.scale_val =
- 			        g_timer_elapsed (mag_timing.scale,
- 						 &microseconds);
-@@ -1971,12 +1971,11 @@
- 	float x_scroll_incr, y_scroll_incr;
- 	int width = magnifier->target_bounds.x2 - magnifier->target_bounds.x1;
- 	int height = magnifier->target_bounds.y2 - magnifier->target_bounds.y1;
-+	gulong microseconds;
- 
- 	mag_timing.num_frame_samples++;
- 	g_timer_stop (mag_timing.frame);
- 
--	gulong microseconds;
--
- 	mag_timing.frame_val = g_timer_elapsed (mag_timing.frame,
- 						&microseconds);
- 
-@@ -2094,10 +2093,10 @@
- 	g_timer_stop (mag_timing.idle);
- 
- 	if (timing_test) {
--		mag_timing.num_idle_samples++;
--
- 		gulong microseconds;
- 
-+		mag_timing.num_idle_samples++;
-+
- 		mag_timing.idle_val = g_timer_elapsed (mag_timing.idle,
- 						       &microseconds);
- 		mag_timing.idle_total += mag_timing.idle_val;
-@@ -2472,6 +2471,7 @@
- 	int screen_height, height;
- 	int pixel_position;
- 	int pixel_direction;
-+	gulong microseconds;
- 
- 	screen_height = gdk_screen_get_height (
- 		gdk_display_get_screen (magnifier->source_display,
-@@ -2484,8 +2484,6 @@
- 	roi.x2 = zoom_region->roi.x2;
- 
- 	g_timer_stop (mag_timing.process);
--
--	gulong microseconds;
- 
- 	total_time = g_timer_elapsed (mag_timing.process, &microseconds);
- 
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index cc46814caf8f..63d840a09aeb 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -9,230 +9,27 @@ lib/orbit-2.0/GNOME_Magnifier_module.la
 lib/orbit-2.0/GNOME_Magnifier_module.so
 libdata/bonobo/servers/GNOME_Magnifier.server
 libdata/pkgconfig/gnome-mag-1.0.pc
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-common_8c-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-common_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-imodule_8c-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-imodule_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-skels_8c-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-skels_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-stubs_8c-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-stubs_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier_8h-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier_8h.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier_8idl-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier_8idl.html
-%%DOCSDIR%%/reference/html/annotated.html
-%%DOCSDIR%%/reference/html/dir_13ad882efed71f625fc815d9016b8292.html
-%%DOCSDIR%%/reference/html/dir_fb436069bdb66ac1a75ca6bf141af2e2.html
-%%DOCSDIR%%/reference/html/dirs.html
-%%DOCSDIR%%/reference/html/doxygen.css
-%%DOCSDIR%%/reference/html/doxygen.png
-%%DOCSDIR%%/reference/html/files.html
-%%DOCSDIR%%/reference/html/functions.html
-%%DOCSDIR%%/reference/html/functions_0x61.html
-%%DOCSDIR%%/reference/html/functions_0x62.html
-%%DOCSDIR%%/reference/html/functions_0x63.html
-%%DOCSDIR%%/reference/html/functions_0x64.html
-%%DOCSDIR%%/reference/html/functions_0x65.html
-%%DOCSDIR%%/reference/html/functions_0x66.html
-%%DOCSDIR%%/reference/html/functions_0x67.html
-%%DOCSDIR%%/reference/html/functions_0x68.html
-%%DOCSDIR%%/reference/html/functions_0x69.html
-%%DOCSDIR%%/reference/html/functions_0x6c.html
-%%DOCSDIR%%/reference/html/functions_0x6d.html
-%%DOCSDIR%%/reference/html/functions_0x6e.html
-%%DOCSDIR%%/reference/html/functions_0x6f.html
-%%DOCSDIR%%/reference/html/functions_0x70.html
-%%DOCSDIR%%/reference/html/functions_0x71.html
-%%DOCSDIR%%/reference/html/functions_0x72.html
-%%DOCSDIR%%/reference/html/functions_0x73.html
-%%DOCSDIR%%/reference/html/functions_0x74.html
-%%DOCSDIR%%/reference/html/functions_0x75.html
-%%DOCSDIR%%/reference/html/functions_0x76.html
-%%DOCSDIR%%/reference/html/functions_0x77.html
-%%DOCSDIR%%/reference/html/functions_0x78.html
-%%DOCSDIR%%/reference/html/functions_0x79.html
-%%DOCSDIR%%/reference/html/functions_0x7a.html
-%%DOCSDIR%%/reference/html/functions_enum.html
-%%DOCSDIR%%/reference/html/functions_eval.html
-%%DOCSDIR%%/reference/html/functions_func.html
-%%DOCSDIR%%/reference/html/functions_vars.html
-%%DOCSDIR%%/reference/html/functions_vars_0x61.html
-%%DOCSDIR%%/reference/html/functions_vars_0x62.html
-%%DOCSDIR%%/reference/html/functions_vars_0x63.html
-%%DOCSDIR%%/reference/html/functions_vars_0x64.html
-%%DOCSDIR%%/reference/html/functions_vars_0x65.html
-%%DOCSDIR%%/reference/html/functions_vars_0x66.html
-%%DOCSDIR%%/reference/html/functions_vars_0x67.html
-%%DOCSDIR%%/reference/html/functions_vars_0x68.html
-%%DOCSDIR%%/reference/html/functions_vars_0x69.html
-%%DOCSDIR%%/reference/html/functions_vars_0x6c.html
-%%DOCSDIR%%/reference/html/functions_vars_0x6d.html
-%%DOCSDIR%%/reference/html/functions_vars_0x6e.html
-%%DOCSDIR%%/reference/html/functions_vars_0x6f.html
-%%DOCSDIR%%/reference/html/functions_vars_0x70.html
-%%DOCSDIR%%/reference/html/functions_vars_0x71.html
-%%DOCSDIR%%/reference/html/functions_vars_0x72.html
-%%DOCSDIR%%/reference/html/functions_vars_0x73.html
-%%DOCSDIR%%/reference/html/functions_vars_0x74.html
-%%DOCSDIR%%/reference/html/functions_vars_0x75.html
-%%DOCSDIR%%/reference/html/functions_vars_0x76.html
-%%DOCSDIR%%/reference/html/functions_vars_0x77.html
-%%DOCSDIR%%/reference/html/functions_vars_0x78.html
-%%DOCSDIR%%/reference/html/functions_vars_0x79.html
-%%DOCSDIR%%/reference/html/functions_vars_0x7a.html
-%%DOCSDIR%%/reference/html/globals.html
-%%DOCSDIR%%/reference/html/globals_0x61.html
-%%DOCSDIR%%/reference/html/globals_0x62.html
-%%DOCSDIR%%/reference/html/globals_0x63.html
-%%DOCSDIR%%/reference/html/globals_0x64.html
-%%DOCSDIR%%/reference/html/globals_0x65.html
-%%DOCSDIR%%/reference/html/globals_0x66.html
-%%DOCSDIR%%/reference/html/globals_0x67.html
-%%DOCSDIR%%/reference/html/globals_0x69.html
-%%DOCSDIR%%/reference/html/globals_0x6c.html
-%%DOCSDIR%%/reference/html/globals_0x6d.html
-%%DOCSDIR%%/reference/html/globals_0x6e.html
-%%DOCSDIR%%/reference/html/globals_0x6f.html
-%%DOCSDIR%%/reference/html/globals_0x70.html
-%%DOCSDIR%%/reference/html/globals_0x72.html
-%%DOCSDIR%%/reference/html/globals_0x73.html
-%%DOCSDIR%%/reference/html/globals_0x74.html
-%%DOCSDIR%%/reference/html/globals_0x75.html
-%%DOCSDIR%%/reference/html/globals_0x7a.html
-%%DOCSDIR%%/reference/html/globals_defs.html
-%%DOCSDIR%%/reference/html/globals_defs_0x62.html
-%%DOCSDIR%%/reference/html/globals_defs_0x63.html
-%%DOCSDIR%%/reference/html/globals_defs_0x64.html
-%%DOCSDIR%%/reference/html/globals_defs_0x65.html
-%%DOCSDIR%%/reference/html/globals_defs_0x67.html
-%%DOCSDIR%%/reference/html/globals_defs_0x69.html
-%%DOCSDIR%%/reference/html/globals_defs_0x6d.html
-%%DOCSDIR%%/reference/html/globals_defs_0x6f.html
-%%DOCSDIR%%/reference/html/globals_defs_0x70.html
-%%DOCSDIR%%/reference/html/globals_defs_0x74.html
-%%DOCSDIR%%/reference/html/globals_defs_0x7a.html
-%%DOCSDIR%%/reference/html/globals_enum.html
-%%DOCSDIR%%/reference/html/globals_eval.html
-%%DOCSDIR%%/reference/html/globals_func.html
-%%DOCSDIR%%/reference/html/globals_func_0x62.html
-%%DOCSDIR%%/reference/html/globals_func_0x63.html
-%%DOCSDIR%%/reference/html/globals_func_0x67.html
-%%DOCSDIR%%/reference/html/globals_func_0x69.html
-%%DOCSDIR%%/reference/html/globals_func_0x6d.html
-%%DOCSDIR%%/reference/html/globals_func_0x70.html
-%%DOCSDIR%%/reference/html/globals_func_0x72.html
-%%DOCSDIR%%/reference/html/globals_func_0x74.html
-%%DOCSDIR%%/reference/html/globals_func_0x7a.html
-%%DOCSDIR%%/reference/html/globals_type.html
-%%DOCSDIR%%/reference/html/globals_vars.html
-%%DOCSDIR%%/reference/html/globals_vars_0x61.html
-%%DOCSDIR%%/reference/html/globals_vars_0x62.html
-%%DOCSDIR%%/reference/html/globals_vars_0x63.html
-%%DOCSDIR%%/reference/html/globals_vars_0x64.html
-%%DOCSDIR%%/reference/html/globals_vars_0x66.html
-%%DOCSDIR%%/reference/html/globals_vars_0x67.html
-%%DOCSDIR%%/reference/html/globals_vars_0x6c.html
-%%DOCSDIR%%/reference/html/globals_vars_0x6d.html
-%%DOCSDIR%%/reference/html/globals_vars_0x6e.html
-%%DOCSDIR%%/reference/html/globals_vars_0x6f.html
-%%DOCSDIR%%/reference/html/globals_vars_0x70.html
-%%DOCSDIR%%/reference/html/globals_vars_0x72.html
-%%DOCSDIR%%/reference/html/globals_vars_0x73.html
-%%DOCSDIR%%/reference/html/globals_vars_0x74.html
-%%DOCSDIR%%/reference/html/globals_vars_0x75.html
-%%DOCSDIR%%/reference/html/globals_vars_0x7a.html
-%%DOCSDIR%%/reference/html/gmag-events_8c-source.html
-%%DOCSDIR%%/reference/html/gmag-events_8c.html
-%%DOCSDIR%%/reference/html/gmag-events_8h-source.html
-%%DOCSDIR%%/reference/html/gmag-events_8h.html
-%%DOCSDIR%%/reference/html/index.html
-%%DOCSDIR%%/reference/html/interfaceGNOME_1_1Magnifier_1_1Magnifier.html
-%%DOCSDIR%%/reference/html/interfaceGNOME_1_1Magnifier_1_1ZoomRegion.html
-%%DOCSDIR%%/reference/html/magnifier-main_8c-source.html
-%%DOCSDIR%%/reference/html/magnifier-main_8c.html
-%%DOCSDIR%%/reference/html/magnifier-private_8h-source.html
-%%DOCSDIR%%/reference/html/magnifier-private_8h.html
-%%DOCSDIR%%/reference/html/magnifier_8c-source.html
-%%DOCSDIR%%/reference/html/magnifier_8c.html
-%%DOCSDIR%%/reference/html/magnifier_8h-source.html
-%%DOCSDIR%%/reference/html/magnifier_8h.html
-%%DOCSDIR%%/reference/html/namespaceGNOME.html
-%%DOCSDIR%%/reference/html/namespaceGNOME_1_1Magnifier.html
-%%DOCSDIR%%/reference/html/namespacemembers.html
-%%DOCSDIR%%/reference/html/namespacemembers_type.html
-%%DOCSDIR%%/reference/html/namespaces.html
-%%DOCSDIR%%/reference/html/structBonobo__EventSource__UnknownListener__type.html
-%%DOCSDIR%%/reference/html/structBonobo__Pair__type.html
-%%DOCSDIR%%/reference/html/structBonobo__PropertyBag__BackendFailed__type.html
-%%DOCSDIR%%/reference/html/structBonobo__PropertyBag__InvalidType__type.html
-%%DOCSDIR%%/reference/html/structBonobo__PropertyBag__NotFound__type.html
-%%DOCSDIR%%/reference/html/structBonobo__PropertyBag__ReadOnly__type.html
-%%DOCSDIR%%/reference/html/structCORBA__sequence__Bonobo__Pair.html
-%%DOCSDIR%%/reference/html/structCORBA__sequence__CORBA__Object.html
-%%DOCSDIR%%/reference/html/structCORBA__sequence__CORBA__string.html
-%%DOCSDIR%%/reference/html/structGNOME_1_1Magnifier_1_1Point.html
-%%DOCSDIR%%/reference/html/structGNOME_1_1Magnifier_1_1RectBounds.html
-%%DOCSDIR%%/reference/html/structGNOME__Magnifier__Point__type.html
-%%DOCSDIR%%/reference/html/structGNOME__Magnifier__RectBounds__type.html
-%%DOCSDIR%%/reference/html/structMagLoginHelper.html
-%%DOCSDIR%%/reference/html/structMagLoginHelperClass.html
-%%DOCSDIR%%/reference/html/structMagnifier.html
-%%DOCSDIR%%/reference/html/structMagnifierClass.html
-%%DOCSDIR%%/reference/html/structMagnifierOptions.html
-%%DOCSDIR%%/reference/html/structMagnifierZoomRegionSaveProps.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__ConfigDatabase.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__ConfigDatabase____epv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__ConfigDatabase____vepv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__EventSource.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__EventSource____epv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__EventSource____vepv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__Listener.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__Listener____epv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__Listener____vepv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__PropertyBag.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__PropertyBag____epv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__PropertyBag____vepv.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__Magnifier.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__Magnifier____epv.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__Magnifier____vepv.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__ZoomRegion.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__ZoomRegion____epv.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__ZoomRegion____vepv.html
-%%DOCSDIR%%/reference/html/structZoomRegion.html
-%%DOCSDIR%%/reference/html/structZoomRegionClass.html
-%%DOCSDIR%%/reference/html/struct__GmagWin.html
-%%DOCSDIR%%/reference/html/struct__MagnifierPrivate.html
-%%DOCSDIR%%/reference/html/struct__ZoomRegionPrivate.html
-%%DOCSDIR%%/reference/html/structtiming.html
-%%DOCSDIR%%/reference/html/tabs.css
-%%DOCSDIR%%/reference/html/zoom-region-private_8h-source.html
-%%DOCSDIR%%/reference/html/zoom-region-private_8h.html
-%%DOCSDIR%%/reference/html/zoom-region_8c-source.html
-%%DOCSDIR%%/reference/html/zoom-region_8c.html
-%%DOCSDIR%%/reference/html/zoom-region_8h-source.html
-%%DOCSDIR%%/reference/html/zoom-region_8h.html
-share/gnome/gnome-mag/1_32/appstart.xpm
-share/gnome/gnome-mag/1_32/bottom_left_corner.xpm
-share/gnome/gnome-mag/1_32/bottom_side.xpm
-share/gnome/gnome-mag/1_32/busy.xpm
-share/gnome/gnome-mag/1_32/crosshair.xpm
-share/gnome/gnome-mag/1_32/default.xpm
-share/gnome/gnome-mag/1_32/fleur.xpm
-share/gnome/gnome-mag/1_32/hand.xpm
-share/gnome/gnome-mag/1_32/left_ptr.xpm
-share/gnome/gnome-mag/1_32/left_side.xpm
-share/gnome/gnome-mag/1_32/no.xpm
-share/gnome/gnome-mag/1_32/right_side.xpm
-share/gnome/gnome-mag/1_32/sb_h_double_arrow.xpm
-share/gnome/gnome-mag/1_32/sb_v_double_arrow.xpm
-share/gnome/gnome-mag/1_32/top_left_corner.xpm
-share/gnome/gnome-mag/1_32/top_right_corner.xpm
-share/gnome/gnome-mag/1_32/top_side.xpm
-share/gnome/gnome-mag/1_32/up.xpm
-share/gnome/gnome-mag/1_32/xterm.xpm
-share/gnome/gnome-mag/default-cursor.xpm
-share/gnome/idl/gnome-mag-1.0/GNOME_Magnifier.idl
+%%DATADIR%%/1_32/appstart.xpm
+%%DATADIR%%/1_32/bottom_left_corner.xpm
+%%DATADIR%%/1_32/bottom_side.xpm
+%%DATADIR%%/1_32/busy.xpm
+%%DATADIR%%/1_32/crosshair.xpm
+%%DATADIR%%/1_32/default.xpm
+%%DATADIR%%/1_32/fleur.xpm
+%%DATADIR%%/1_32/hand.xpm
+%%DATADIR%%/1_32/left_ptr.xpm
+%%DATADIR%%/1_32/left_side.xpm
+%%DATADIR%%/1_32/no.xpm
+%%DATADIR%%/1_32/right_side.xpm
+%%DATADIR%%/1_32/sb_h_double_arrow.xpm
+%%DATADIR%%/1_32/sb_v_double_arrow.xpm
+%%DATADIR%%/1_32/top_left_corner.xpm
+%%DATADIR%%/1_32/top_right_corner.xpm
+%%DATADIR%%/1_32/top_side.xpm
+%%DATADIR%%/1_32/up.xpm
+%%DATADIR%%/1_32/xterm.xpm
+%%DATADIR%%/default-cursor.xpm
+share/idl/gnome-mag-1.0/GNOME_Magnifier.idl
 share/locale/ang/LC_MESSAGES/gnome-mag.mo
 share/locale/ar/LC_MESSAGES/gnome-mag.mo
 share/locale/as/LC_MESSAGES/gnome-mag.mo
@@ -289,6 +86,7 @@ share/locale/nb/LC_MESSAGES/gnome-mag.mo
 share/locale/ne/LC_MESSAGES/gnome-mag.mo
 share/locale/nl/LC_MESSAGES/gnome-mag.mo
 share/locale/nn/LC_MESSAGES/gnome-mag.mo
+share/locale/oc/LC_MESSAGES/gnome-mag.mo
 share/locale/or/LC_MESSAGES/gnome-mag.mo
 share/locale/pa/LC_MESSAGES/gnome-mag.mo
 share/locale/pl/LC_MESSAGES/gnome-mag.mo
@@ -305,6 +103,7 @@ share/locale/sr/LC_MESSAGES/gnome-mag.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-mag.mo
 share/locale/sv/LC_MESSAGES/gnome-mag.mo
 share/locale/ta/LC_MESSAGES/gnome-mag.mo
+share/locale/te/LC_MESSAGES/gnome-mag.mo
 share/locale/th/LC_MESSAGES/gnome-mag.mo
 share/locale/tk/LC_MESSAGES/gnome-mag.mo
 share/locale/tr/LC_MESSAGES/gnome-mag.mo
@@ -314,9 +113,9 @@ share/locale/vi/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
-@dirrm share/gnome/idl/gnome-mag-1.0
-@dirrm share/gnome/gnome-mag/1_32
-@dirrm share/gnome/gnome-mag
+@dirrm share/idl/gnome-mag-1.0
+@dirrm %%DATADIR%%/1_32
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%/reference/html
 @dirrm %%DOCSDIR%%/reference
 @dirrm %%DOCSDIR%%
@@ -326,10 +125,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index bb94572054c4..83347adbc7d9 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/gnopernicus/Makefile,v 1.83 2006/08/22 02:55:02 marcus Exp $
+#   $MCom: ports/accessibility/gnopernicus/Makefile,v 1.85 2007/07/23 19:03:49 mezz Exp $
 #
 
 PORTNAME=	gnopernicus
 PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	accessibility x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist
index aff614a188e2..d1944a296bcf 100644
--- a/accessibility/gnopernicus/pkg-plist
+++ b/accessibility/gnopernicus/pkg-plist
@@ -45,35 +45,35 @@ lib/gnopernicus-1.0/libsrutil.so
 lib/gnopernicus-1.0/libsrutil.so.%%SHLIB_VERSION%%
 libdata/pkgconfig/gnopernicus-1.0.pc
 libexec/brlmonitor
-share/gnome/applications/gnopernicus.desktop
-share/gnome/gnopernicus/glade/gnopi_files/Braille_Monitor_Settings/braille_monitor_settings.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/attribute_settings.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/braille_device.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/braille_fill_char.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/braille_mapping.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/braille_settings.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/braille_style.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/cursor_settings.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/status_cell.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/translation_table.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Find/find.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Find/text_selected_24.png
-share/gnome/gnopernicus/glade/gnopi_files/General_Settings/general_settings.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Keyboard_Mouse_Settings/keyboard_mouse_settings.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Language/language.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Load_Default/load_default.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Magnifier_Settings/magnifier_settings.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Presentation/presentation.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Screen_Review/screen_review.glade2
-share/gnome/gnopernicus/glade/gnopi_files/Speech_Settings/speech_settings.glade2
-share/gnome/gnopernicus/glade/gnopi_files/User_Properties/user_properties.glade2
-share/gnome/gnopernicus/glade/gnopi_files/braille.xpm
-share/gnome/gnopernicus/glade/gnopi_files/gnopi.glade2
-share/gnome/gnopernicus/glade/gnopi_files/keyboard.xpm
-share/gnome/gnopernicus/glade/gnopi_files/monitor.png
-share/gnome/gnopernicus/glade/gnopi_files/start_up.png
-share/gnome/gnopernicus/presentation/default.xml
-share/gnome/gnopernicus/presentation/verbose.xml
+share/applications/gnopernicus.desktop
+share/gnopernicus/glade/gnopi_files/Braille_Monitor_Settings/braille_monitor_settings.glade2
+share/gnopernicus/glade/gnopi_files/Braille_Settings/attribute_settings.glade2
+share/gnopernicus/glade/gnopi_files/Braille_Settings/braille_device.glade2
+share/gnopernicus/glade/gnopi_files/Braille_Settings/braille_fill_char.glade2
+share/gnopernicus/glade/gnopi_files/Braille_Settings/braille_mapping.glade2
+share/gnopernicus/glade/gnopi_files/Braille_Settings/braille_settings.glade2
+share/gnopernicus/glade/gnopi_files/Braille_Settings/braille_style.glade2
+share/gnopernicus/glade/gnopi_files/Braille_Settings/cursor_settings.glade2
+share/gnopernicus/glade/gnopi_files/Braille_Settings/status_cell.glade2
+share/gnopernicus/glade/gnopi_files/Braille_Settings/translation_table.glade2
+share/gnopernicus/glade/gnopi_files/Find/find.glade2
+share/gnopernicus/glade/gnopi_files/Find/text_selected_24.png
+share/gnopernicus/glade/gnopi_files/General_Settings/general_settings.glade2
+share/gnopernicus/glade/gnopi_files/Keyboard_Mouse_Settings/keyboard_mouse_settings.glade2
+share/gnopernicus/glade/gnopi_files/Language/language.glade2
+share/gnopernicus/glade/gnopi_files/Load_Default/load_default.glade2
+share/gnopernicus/glade/gnopi_files/Magnifier_Settings/magnifier_settings.glade2
+share/gnopernicus/glade/gnopi_files/Presentation/presentation.glade2
+share/gnopernicus/glade/gnopi_files/Screen_Review/screen_review.glade2
+share/gnopernicus/glade/gnopi_files/Speech_Settings/speech_settings.glade2
+share/gnopernicus/glade/gnopi_files/User_Properties/user_properties.glade2
+share/gnopernicus/glade/gnopi_files/braille.xpm
+share/gnopernicus/glade/gnopi_files/gnopi.glade2
+share/gnopernicus/glade/gnopi_files/keyboard.xpm
+share/gnopernicus/glade/gnopi_files/monitor.png
+share/gnopernicus/glade/gnopi_files/start_up.png
+share/gnopernicus/presentation/default.xml
+share/gnopernicus/presentation/verbose.xml
 share/gnome/help/brlmonitor/C/brlmonitor.xml
 share/gnome/help/brlmonitor/C/legal.xml
 share/gnome/help/brlmonitor/es/brlmonitor.xml
@@ -85,10 +85,10 @@ share/gnome/help/gnopernicus/es/legal.xml
 share/gnome/help/gnopernicus/pt_BR/figures/gnopernicus.png
 share/gnome/help/gnopernicus/pt_BR/gnopernicus.xml
 share/gnome/help/gnopernicus/pt_BR/legal.xml
-share/gnome/omf/gnopernicus/brlmonitor-C.omf
-share/gnome/omf/gnopernicus/brlmonitor-es.omf
-share/gnome/omf/gnopernicus/gnopernicus-C.omf
-share/gnome/omf/gnopernicus/gnopernicus-es.omf
+share/omf/gnopernicus/brlmonitor-C.omf
+share/omf/gnopernicus/brlmonitor-es.omf
+share/omf/gnopernicus/gnopernicus-C.omf
+share/omf/gnopernicus/gnopernicus-es.omf
 share/icons/hicolor/48x48/apps/gnopernicus.png
 share/locale/ar/LC_MESSAGES/gnopernicus.mo
 share/locale/az/LC_MESSAGES/gnopernicus.mo
@@ -152,7 +152,7 @@ share/locale/vi/LC_MESSAGES/gnopernicus.mo
 share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo
 share/locale/zh_HK/LC_MESSAGES/gnopernicus.mo
 share/locale/zh_TW/LC_MESSAGES/gnopernicus.mo
-@dirrm share/gnome/omf/gnopernicus
+@dirrm share/omf/gnopernicus
 @dirrm share/gnome/help/gnopernicus/pt_BR/figures
 @dirrm share/gnome/help/gnopernicus/pt_BR
 @dirrm share/gnome/help/gnopernicus/es
@@ -161,22 +161,22 @@ share/locale/zh_TW/LC_MESSAGES/gnopernicus.mo
 @dirrm share/gnome/help/brlmonitor/es
 @dirrm share/gnome/help/brlmonitor/C
 @dirrm share/gnome/help/brlmonitor
-@dirrm share/gnome/gnopernicus/presentation
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/User_Properties
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/Speech_Settings
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/Screen_Review
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/Presentation
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/Magnifier_Settings
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/Load_Default
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/Language
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/Keyboard_Mouse_Settings
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/General_Settings
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/Find
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings
-@dirrm share/gnome/gnopernicus/glade/gnopi_files/Braille_Monitor_Settings
-@dirrm share/gnome/gnopernicus/glade/gnopi_files
-@dirrm share/gnome/gnopernicus/glade
-@dirrm share/gnome/gnopernicus
+@dirrm share/gnopernicus/presentation
+@dirrm share/gnopernicus/glade/gnopi_files/User_Properties
+@dirrm share/gnopernicus/glade/gnopi_files/Speech_Settings
+@dirrm share/gnopernicus/glade/gnopi_files/Screen_Review
+@dirrm share/gnopernicus/glade/gnopi_files/Presentation
+@dirrm share/gnopernicus/glade/gnopi_files/Magnifier_Settings
+@dirrm share/gnopernicus/glade/gnopi_files/Load_Default
+@dirrm share/gnopernicus/glade/gnopi_files/Language
+@dirrm share/gnopernicus/glade/gnopi_files/Keyboard_Mouse_Settings
+@dirrm share/gnopernicus/glade/gnopi_files/General_Settings
+@dirrm share/gnopernicus/glade/gnopi_files/Find
+@dirrm share/gnopernicus/glade/gnopi_files/Braille_Settings
+@dirrm share/gnopernicus/glade/gnopi_files/Braille_Monitor_Settings
+@dirrm share/gnopernicus/glade/gnopi_files
+@dirrm share/gnopernicus/glade
+@dirrm share/gnopernicus
 @dirrm lib/gnopernicus-1.0
 @dirrm include/gnopernicus-1.0/libsrutil
 @dirrm include/gnopernicus-1.0/libsrs
@@ -200,3 +200,4 @@ share/locale/zh_TW/LC_MESSAGES/gnopernicus.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 344951e2b316..1bbcb88d2c37 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Adam Weinberger <adamw@freebsd.org>
 #
 # $FreeBSD$
-#    $MCom: ports/accessibility/gok/Makefile,v 1.72 2006/08/26 03:50:50 marcus Exp $
+#    $MCom: ports/accessibility/gok/Makefile,v 1.83 2007/10/15 13:40:59 ahze Exp $
 #
 
 PORTNAME=	gok
-PORTVERSION=	1.2.5
+PORTVERSION=	1.3.7
 PORTEPOCH=	1
 CATEGORIES=	accessibility sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -26,8 +26,8 @@ USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	gok.schemas
 
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 1677beb81f22..188bcf363494 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gok-1.2.5.tar.bz2) = 2ef1f171385a37f93408dbca7ecfdf11
-SHA256 (gnome2/gok-1.2.5.tar.bz2) = 780dd1e5b13036062f3c843a54b8a30d3759b4136e6d0fbcc025521fd9df7099
-SIZE (gnome2/gok-1.2.5.tar.bz2) = 1229265
+MD5 (gnome2/gok-1.3.7.tar.bz2) = 14b2407604ceec0ffcbf4866fef35502
+SHA256 (gnome2/gok-1.3.7.tar.bz2) = 075442504ab2179484cfb02bc062ba5861efc5f34286702b17f488b80ea242d5
+SIZE (gnome2/gok-1.3.7.tar.bz2) = 1293913
diff --git a/accessibility/gok/files/patch-gok_main.c b/accessibility/gok/files/patch-gok_main.c
new file mode 100644
index 000000000000..dc2a6ba45e07
--- /dev/null
+++ b/accessibility/gok/files/patch-gok_main.c
@@ -0,0 +1,10 @@
+--- gok/main.c.orig	2007-10-13 16:43:20.000000000 -0400
++++ gok/main.c	2007-10-13 16:47:05.000000000 -0400
+@@ -1229,6 +1229,7 @@ static gboolean gok_main_xevie_io (GIOCh
+ {
+ #ifdef HAVE_XEVIE
+     while (xevie_dpy && XPending (xevie_dpy)) {
++      XEvent xevie_event;
+       XMotionEvent *motion_event;
+       gboolean has_active_key = gok_scanner_key_is_active ();
+       /* Xevie has a motion event for us to check */
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index 1060a65e0fcc..0bbd7c51418e 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -2,6 +2,7 @@ bin/create-branching-keyboard
 bin/gok
 libdata/bonobo/servers/GNOME_Gok.server
 libdata/pkgconfig/gok-1.0.pc
+share/applications/gok.desktop
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/ch03.html
@@ -60,725 +61,752 @@ libdata/pkgconfig/gok-1.0.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/applications/gok.desktop
-share/gnome/gok/East.png
-share/gnome/gok/Keyboard.kbd
-share/gnome/gok/NE.png
-share/gnome/gok/NW.png
-share/gnome/gok/North.png
-share/gnome/gok/SE.png
-share/gnome/gok/SW.png
-share/gnome/gok/South.png
-share/gnome/gok/West.png
-share/gnome/gok/am/gok-controls.kbd
-share/gnome/gok/am/hide.kbd
-share/gnome/gok/am/launcher.kbd
-share/gnome/gok/am/main.kbd
-share/gnome/gok/am/mouse.kbd
-share/gnome/gok/am/move-resize.kbd
-share/gnome/gok/am/numberpad.kbd
-share/gnome/gok/am/quit.kbd
-share/gnome/gok/am/text-operations.kbd
-share/gnome/gok/am/valuator.kbd
-share/gnome/gok/ang/gok-controls.kbd
-share/gnome/gok/ang/hide.kbd
-share/gnome/gok/ang/launcher.kbd
-share/gnome/gok/ang/main.kbd
-share/gnome/gok/ang/mouse.kbd
-share/gnome/gok/ang/move-resize.kbd
-share/gnome/gok/ang/numberpad.kbd
-share/gnome/gok/ang/quit.kbd
-share/gnome/gok/ang/text-operations.kbd
-share/gnome/gok/ang/valuator.kbd
-share/gnome/gok/ar/gok-controls.kbd
-share/gnome/gok/ar/hide.kbd
-share/gnome/gok/ar/launcher.kbd
-share/gnome/gok/ar/main.kbd
-share/gnome/gok/ar/mouse.kbd
-share/gnome/gok/ar/move-resize.kbd
-share/gnome/gok/ar/numberpad.kbd
-share/gnome/gok/ar/quit.kbd
-share/gnome/gok/ar/text-operations.kbd
-share/gnome/gok/ar/valuator.kbd
-share/gnome/gok/automatic-scanning.xam
-share/gnome/gok/az/gok-controls.kbd
-share/gnome/gok/az/hide.kbd
-share/gnome/gok/az/launcher.kbd
-share/gnome/gok/az/main.kbd
-share/gnome/gok/az/mouse.kbd
-share/gnome/gok/az/move-resize.kbd
-share/gnome/gok/az/numberpad.kbd
-share/gnome/gok/az/quit.kbd
-share/gnome/gok/az/text-operations.kbd
-share/gnome/gok/az/valuator.kbd
-share/gnome/gok/be/gok-controls.kbd
-share/gnome/gok/be/hide.kbd
-share/gnome/gok/be/launcher.kbd
-share/gnome/gok/be/main.kbd
-share/gnome/gok/be/mouse.kbd
-share/gnome/gok/be/move-resize.kbd
-share/gnome/gok/be/numberpad.kbd
-share/gnome/gok/be/quit.kbd
-share/gnome/gok/be/text-operations.kbd
-share/gnome/gok/be/valuator.kbd
-share/gnome/gok/bg/gok-controls.kbd
-share/gnome/gok/bg/hide.kbd
-share/gnome/gok/bg/launcher.kbd
-share/gnome/gok/bg/main.kbd
-share/gnome/gok/bg/mouse.kbd
-share/gnome/gok/bg/move-resize.kbd
-share/gnome/gok/bg/numberpad.kbd
-share/gnome/gok/bg/quit.kbd
-share/gnome/gok/bg/text-operations.kbd
-share/gnome/gok/bg/valuator.kbd
-share/gnome/gok/bn/gok-controls.kbd
-share/gnome/gok/bn/hide.kbd
-share/gnome/gok/bn/launcher.kbd
-share/gnome/gok/bn/main.kbd
-share/gnome/gok/bn/mouse.kbd
-share/gnome/gok/bn/move-resize.kbd
-share/gnome/gok/bn/numberpad.kbd
-share/gnome/gok/bn/quit.kbd
-share/gnome/gok/bn/text-operations.kbd
-share/gnome/gok/bn/valuator.kbd
-share/gnome/gok/bn_IN/gok-controls.kbd
-share/gnome/gok/bn_IN/hide.kbd
-share/gnome/gok/bn_IN/launcher.kbd
-share/gnome/gok/bn_IN/main.kbd
-share/gnome/gok/bn_IN/mouse.kbd
-share/gnome/gok/bn_IN/move-resize.kbd
-share/gnome/gok/bn_IN/numberpad.kbd
-share/gnome/gok/bn_IN/quit.kbd
-share/gnome/gok/bn_IN/text-operations.kbd
-share/gnome/gok/bn_IN/valuator.kbd
-share/gnome/gok/ca/gok-controls.kbd
-share/gnome/gok/ca/hide.kbd
-share/gnome/gok/ca/launcher.kbd
-share/gnome/gok/ca/main.kbd
-share/gnome/gok/ca/mouse.kbd
-share/gnome/gok/ca/move-resize.kbd
-share/gnome/gok/ca/numberpad.kbd
-share/gnome/gok/ca/quit.kbd
-share/gnome/gok/ca/text-operations.kbd
-share/gnome/gok/ca/valuator.kbd
-share/gnome/gok/cs/gok-controls.kbd
-share/gnome/gok/cs/hide.kbd
-share/gnome/gok/cs/launcher.kbd
-share/gnome/gok/cs/main.kbd
-share/gnome/gok/cs/mouse.kbd
-share/gnome/gok/cs/move-resize.kbd
-share/gnome/gok/cs/numberpad.kbd
-share/gnome/gok/cs/quit.kbd
-share/gnome/gok/cs/text-operations.kbd
-share/gnome/gok/cs/valuator.kbd
-share/gnome/gok/cy/gok-controls.kbd
-share/gnome/gok/cy/hide.kbd
-share/gnome/gok/cy/launcher.kbd
-share/gnome/gok/cy/main.kbd
-share/gnome/gok/cy/mouse.kbd
-share/gnome/gok/cy/move-resize.kbd
-share/gnome/gok/cy/numberpad.kbd
-share/gnome/gok/cy/quit.kbd
-share/gnome/gok/cy/text-operations.kbd
-share/gnome/gok/cy/valuator.kbd
-share/gnome/gok/da/gok-controls.kbd
-share/gnome/gok/da/hide.kbd
-share/gnome/gok/da/launcher.kbd
-share/gnome/gok/da/main.kbd
-share/gnome/gok/da/mouse.kbd
-share/gnome/gok/da/move-resize.kbd
-share/gnome/gok/da/numberpad.kbd
-share/gnome/gok/da/quit.kbd
-share/gnome/gok/da/text-operations.kbd
-share/gnome/gok/da/valuator.kbd
-share/gnome/gok/de/gok-controls.kbd
-share/gnome/gok/de/hide.kbd
-share/gnome/gok/de/launcher.kbd
-share/gnome/gok/de/main.kbd
-share/gnome/gok/de/mouse.kbd
-share/gnome/gok/de/move-resize.kbd
-share/gnome/gok/de/numberpad.kbd
-share/gnome/gok/de/quit.kbd
-share/gnome/gok/de/text-operations.kbd
-share/gnome/gok/de/valuator.kbd
-share/gnome/gok/dictionary.txt
-share/gnome/gok/direct-selection.xam
-share/gnome/gok/directed.xam
-share/gnome/gok/dwell-selection.xam
-share/gnome/gok/dz/gok-controls.kbd
-share/gnome/gok/dz/hide.kbd
-share/gnome/gok/dz/launcher.kbd
-share/gnome/gok/dz/main.kbd
-share/gnome/gok/dz/mouse.kbd
-share/gnome/gok/dz/move-resize.kbd
-share/gnome/gok/dz/numberpad.kbd
-share/gnome/gok/dz/quit.kbd
-share/gnome/gok/dz/text-operations.kbd
-share/gnome/gok/dz/valuator.kbd
-share/gnome/gok/el/gok-controls.kbd
-share/gnome/gok/el/hide.kbd
-share/gnome/gok/el/launcher.kbd
-share/gnome/gok/el/main.kbd
-share/gnome/gok/el/mouse.kbd
-share/gnome/gok/el/move-resize.kbd
-share/gnome/gok/el/numberpad.kbd
-share/gnome/gok/el/quit.kbd
-share/gnome/gok/el/text-operations.kbd
-share/gnome/gok/el/valuator.kbd
-share/gnome/gok/empty.png
-share/gnome/gok/en_CA/gok-controls.kbd
-share/gnome/gok/en_CA/hide.kbd
-share/gnome/gok/en_CA/launcher.kbd
-share/gnome/gok/en_CA/main.kbd
-share/gnome/gok/en_CA/mouse.kbd
-share/gnome/gok/en_CA/move-resize.kbd
-share/gnome/gok/en_CA/numberpad.kbd
-share/gnome/gok/en_CA/quit.kbd
-share/gnome/gok/en_CA/text-operations.kbd
-share/gnome/gok/en_CA/valuator.kbd
-share/gnome/gok/en_GB/gok-controls.kbd
-share/gnome/gok/en_GB/hide.kbd
-share/gnome/gok/en_GB/launcher.kbd
-share/gnome/gok/en_GB/main.kbd
-share/gnome/gok/en_GB/mouse.kbd
-share/gnome/gok/en_GB/move-resize.kbd
-share/gnome/gok/en_GB/numberpad.kbd
-share/gnome/gok/en_GB/quit.kbd
-share/gnome/gok/en_GB/text-operations.kbd
-share/gnome/gok/en_GB/valuator.kbd
-share/gnome/gok/es/gok-controls.kbd
-share/gnome/gok/es/hide.kbd
-share/gnome/gok/es/launcher.kbd
-share/gnome/gok/es/main.kbd
-share/gnome/gok/es/mouse.kbd
-share/gnome/gok/es/move-resize.kbd
-share/gnome/gok/es/numberpad.kbd
-share/gnome/gok/es/quit.kbd
-share/gnome/gok/es/text-operations.kbd
-share/gnome/gok/es/valuator.kbd
-share/gnome/gok/et/gok-controls.kbd
-share/gnome/gok/et/hide.kbd
-share/gnome/gok/et/launcher.kbd
-share/gnome/gok/et/main.kbd
-share/gnome/gok/et/mouse.kbd
-share/gnome/gok/et/move-resize.kbd
-share/gnome/gok/et/numberpad.kbd
-share/gnome/gok/et/quit.kbd
-share/gnome/gok/et/text-operations.kbd
-share/gnome/gok/et/valuator.kbd
-share/gnome/gok/eu/gok-controls.kbd
-share/gnome/gok/eu/hide.kbd
-share/gnome/gok/eu/launcher.kbd
-share/gnome/gok/eu/main.kbd
-share/gnome/gok/eu/mouse.kbd
-share/gnome/gok/eu/move-resize.kbd
-share/gnome/gok/eu/numberpad.kbd
-share/gnome/gok/eu/quit.kbd
-share/gnome/gok/eu/text-operations.kbd
-share/gnome/gok/eu/valuator.kbd
-share/gnome/gok/fa/gok-controls.kbd
-share/gnome/gok/fa/hide.kbd
-share/gnome/gok/fa/launcher.kbd
-share/gnome/gok/fa/main.kbd
-share/gnome/gok/fa/mouse.kbd
-share/gnome/gok/fa/move-resize.kbd
-share/gnome/gok/fa/numberpad.kbd
-share/gnome/gok/fa/quit.kbd
-share/gnome/gok/fa/text-operations.kbd
-share/gnome/gok/fa/valuator.kbd
-share/gnome/gok/fi/gok-controls.kbd
-share/gnome/gok/fi/hide.kbd
-share/gnome/gok/fi/launcher.kbd
-share/gnome/gok/fi/main.kbd
-share/gnome/gok/fi/mouse.kbd
-share/gnome/gok/fi/move-resize.kbd
-share/gnome/gok/fi/numberpad.kbd
-share/gnome/gok/fi/quit.kbd
-share/gnome/gok/fi/text-operations.kbd
-share/gnome/gok/fi/valuator.kbd
-share/gnome/gok/fr/gok-controls.kbd
-share/gnome/gok/fr/hide.kbd
-share/gnome/gok/fr/launcher.kbd
-share/gnome/gok/fr/main.kbd
-share/gnome/gok/fr/mouse.kbd
-share/gnome/gok/fr/move-resize.kbd
-share/gnome/gok/fr/numberpad.kbd
-share/gnome/gok/fr/quit.kbd
-share/gnome/gok/fr/text-operations.kbd
-share/gnome/gok/fr/valuator.kbd
-share/gnome/gok/ga/gok-controls.kbd
-share/gnome/gok/ga/hide.kbd
-share/gnome/gok/ga/launcher.kbd
-share/gnome/gok/ga/main.kbd
-share/gnome/gok/ga/mouse.kbd
-share/gnome/gok/ga/move-resize.kbd
-share/gnome/gok/ga/numberpad.kbd
-share/gnome/gok/ga/quit.kbd
-share/gnome/gok/ga/text-operations.kbd
-share/gnome/gok/ga/valuator.kbd
-share/gnome/gok/gl/gok-controls.kbd
-share/gnome/gok/gl/hide.kbd
-share/gnome/gok/gl/launcher.kbd
-share/gnome/gok/gl/main.kbd
-share/gnome/gok/gl/mouse.kbd
-share/gnome/gok/gl/move-resize.kbd
-share/gnome/gok/gl/numberpad.kbd
-share/gnome/gok/gl/quit.kbd
-share/gnome/gok/gl/text-operations.kbd
-share/gnome/gok/gl/valuator.kbd
-share/gnome/gok/glade/gok.glade2
-share/gnome/gok/gok-controls.kbd
-share/gnome/gok/gok.rc
-share/gnome/gok/goklogo.png
-share/gnome/gok/goksound1.wav
-share/gnome/gok/goksound2.wav
-share/gnome/gok/gu/gok-controls.kbd
-share/gnome/gok/gu/hide.kbd
-share/gnome/gok/gu/launcher.kbd
-share/gnome/gok/gu/main.kbd
-share/gnome/gok/gu/mouse.kbd
-share/gnome/gok/gu/move-resize.kbd
-share/gnome/gok/gu/numberpad.kbd
-share/gnome/gok/gu/quit.kbd
-share/gnome/gok/gu/text-operations.kbd
-share/gnome/gok/gu/valuator.kbd
-share/gnome/gok/hi/gok-controls.kbd
-share/gnome/gok/hi/hide.kbd
-share/gnome/gok/hi/launcher.kbd
-share/gnome/gok/hi/main.kbd
-share/gnome/gok/hi/mouse.kbd
-share/gnome/gok/hi/move-resize.kbd
-share/gnome/gok/hi/numberpad.kbd
-share/gnome/gok/hi/quit.kbd
-share/gnome/gok/hi/text-operations.kbd
-share/gnome/gok/hi/valuator.kbd
-share/gnome/gok/hide.kbd
-share/gnome/gok/hr/gok-controls.kbd
-share/gnome/gok/hr/hide.kbd
-share/gnome/gok/hr/launcher.kbd
-share/gnome/gok/hr/main.kbd
-share/gnome/gok/hr/mouse.kbd
-share/gnome/gok/hr/move-resize.kbd
-share/gnome/gok/hr/numberpad.kbd
-share/gnome/gok/hr/quit.kbd
-share/gnome/gok/hr/text-operations.kbd
-share/gnome/gok/hr/valuator.kbd
-share/gnome/gok/hu/gok-controls.kbd
-share/gnome/gok/hu/hide.kbd
-share/gnome/gok/hu/launcher.kbd
-share/gnome/gok/hu/main.kbd
-share/gnome/gok/hu/mouse.kbd
-share/gnome/gok/hu/move-resize.kbd
-share/gnome/gok/hu/numberpad.kbd
-share/gnome/gok/hu/quit.kbd
-share/gnome/gok/hu/text-operations.kbd
-share/gnome/gok/hu/valuator.kbd
-share/gnome/gok/id/gok-controls.kbd
-share/gnome/gok/id/hide.kbd
-share/gnome/gok/id/launcher.kbd
-share/gnome/gok/id/main.kbd
-share/gnome/gok/id/mouse.kbd
-share/gnome/gok/id/move-resize.kbd
-share/gnome/gok/id/numberpad.kbd
-share/gnome/gok/id/quit.kbd
-share/gnome/gok/id/text-operations.kbd
-share/gnome/gok/id/valuator.kbd
-share/gnome/gok/inverse-scanning.xam
-share/gnome/gok/it/gok-controls.kbd
-share/gnome/gok/it/hide.kbd
-share/gnome/gok/it/launcher.kbd
-share/gnome/gok/it/main.kbd
-share/gnome/gok/it/mouse.kbd
-share/gnome/gok/it/move-resize.kbd
-share/gnome/gok/it/numberpad.kbd
-share/gnome/gok/it/quit.kbd
-share/gnome/gok/it/text-operations.kbd
-share/gnome/gok/it/valuator.kbd
-share/gnome/gok/ja/gok-controls.kbd
-share/gnome/gok/ja/hide.kbd
-share/gnome/gok/ja/launcher.kbd
-share/gnome/gok/ja/main.kbd
-share/gnome/gok/ja/mouse.kbd
-share/gnome/gok/ja/move-resize.kbd
-share/gnome/gok/ja/numberpad.kbd
-share/gnome/gok/ja/quit.kbd
-share/gnome/gok/ja/text-operations.kbd
-share/gnome/gok/ja/valuator.kbd
-share/gnome/gok/ka/gok-controls.kbd
-share/gnome/gok/ka/hide.kbd
-share/gnome/gok/ka/launcher.kbd
-share/gnome/gok/ka/main.kbd
-share/gnome/gok/ka/mouse.kbd
-share/gnome/gok/ka/move-resize.kbd
-share/gnome/gok/ka/numberpad.kbd
-share/gnome/gok/ka/quit.kbd
-share/gnome/gok/ka/text-operations.kbd
-share/gnome/gok/ka/valuator.kbd
-share/gnome/gok/ko/gok-controls.kbd
-share/gnome/gok/ko/hide.kbd
-share/gnome/gok/ko/launcher.kbd
-share/gnome/gok/ko/main.kbd
-share/gnome/gok/ko/mouse.kbd
-share/gnome/gok/ko/move-resize.kbd
-share/gnome/gok/ko/numberpad.kbd
-share/gnome/gok/ko/quit.kbd
-share/gnome/gok/ko/text-operations.kbd
-share/gnome/gok/ko/valuator.kbd
-share/gnome/gok/ku/gok-controls.kbd
-share/gnome/gok/ku/hide.kbd
-share/gnome/gok/ku/launcher.kbd
-share/gnome/gok/ku/main.kbd
-share/gnome/gok/ku/mouse.kbd
-share/gnome/gok/ku/move-resize.kbd
-share/gnome/gok/ku/numberpad.kbd
-share/gnome/gok/ku/quit.kbd
-share/gnome/gok/ku/text-operations.kbd
-share/gnome/gok/ku/valuator.kbd
-share/gnome/gok/latched.png
-share/gnome/gok/launcher.kbd
-share/gnome/gok/locked.png
-share/gnome/gok/lt/gok-controls.kbd
-share/gnome/gok/lt/hide.kbd
-share/gnome/gok/lt/launcher.kbd
-share/gnome/gok/lt/main.kbd
-share/gnome/gok/lt/mouse.kbd
-share/gnome/gok/lt/move-resize.kbd
-share/gnome/gok/lt/numberpad.kbd
-share/gnome/gok/lt/quit.kbd
-share/gnome/gok/lt/text-operations.kbd
-share/gnome/gok/lt/valuator.kbd
-share/gnome/gok/lv/gok-controls.kbd
-share/gnome/gok/lv/hide.kbd
-share/gnome/gok/lv/launcher.kbd
-share/gnome/gok/lv/main.kbd
-share/gnome/gok/lv/mouse.kbd
-share/gnome/gok/lv/move-resize.kbd
-share/gnome/gok/lv/numberpad.kbd
-share/gnome/gok/lv/quit.kbd
-share/gnome/gok/lv/text-operations.kbd
-share/gnome/gok/lv/valuator.kbd
-share/gnome/gok/main.kbd
-share/gnome/gok/manage.kbd
-share/gnome/gok/mk/gok-controls.kbd
-share/gnome/gok/mk/hide.kbd
-share/gnome/gok/mk/launcher.kbd
-share/gnome/gok/mk/main.kbd
-share/gnome/gok/mk/mouse.kbd
-share/gnome/gok/mk/move-resize.kbd
-share/gnome/gok/mk/numberpad.kbd
-share/gnome/gok/mk/quit.kbd
-share/gnome/gok/mk/text-operations.kbd
-share/gnome/gok/mk/valuator.kbd
-share/gnome/gok/ml/gok-controls.kbd
-share/gnome/gok/ml/hide.kbd
-share/gnome/gok/ml/launcher.kbd
-share/gnome/gok/ml/main.kbd
-share/gnome/gok/ml/mouse.kbd
-share/gnome/gok/ml/move-resize.kbd
-share/gnome/gok/ml/numberpad.kbd
-share/gnome/gok/ml/quit.kbd
-share/gnome/gok/ml/text-operations.kbd
-share/gnome/gok/ml/valuator.kbd
-share/gnome/gok/mn/gok-controls.kbd
-share/gnome/gok/mn/hide.kbd
-share/gnome/gok/mn/launcher.kbd
-share/gnome/gok/mn/main.kbd
-share/gnome/gok/mn/mouse.kbd
-share/gnome/gok/mn/move-resize.kbd
-share/gnome/gok/mn/numberpad.kbd
-share/gnome/gok/mn/quit.kbd
-share/gnome/gok/mn/text-operations.kbd
-share/gnome/gok/mn/valuator.kbd
-share/gnome/gok/mouse.kbd
-share/gnome/gok/move-resize.kbd
-share/gnome/gok/mr/gok-controls.kbd
-share/gnome/gok/mr/hide.kbd
-share/gnome/gok/mr/launcher.kbd
-share/gnome/gok/mr/main.kbd
-share/gnome/gok/mr/mouse.kbd
-share/gnome/gok/mr/move-resize.kbd
-share/gnome/gok/mr/numberpad.kbd
-share/gnome/gok/mr/quit.kbd
-share/gnome/gok/mr/text-operations.kbd
-share/gnome/gok/mr/valuator.kbd
-share/gnome/gok/ms/gok-controls.kbd
-share/gnome/gok/ms/hide.kbd
-share/gnome/gok/ms/launcher.kbd
-share/gnome/gok/ms/main.kbd
-share/gnome/gok/ms/mouse.kbd
-share/gnome/gok/ms/move-resize.kbd
-share/gnome/gok/ms/numberpad.kbd
-share/gnome/gok/ms/quit.kbd
-share/gnome/gok/ms/text-operations.kbd
-share/gnome/gok/ms/valuator.kbd
-share/gnome/gok/nb/gok-controls.kbd
-share/gnome/gok/nb/hide.kbd
-share/gnome/gok/nb/launcher.kbd
-share/gnome/gok/nb/main.kbd
-share/gnome/gok/nb/mouse.kbd
-share/gnome/gok/nb/move-resize.kbd
-share/gnome/gok/nb/numberpad.kbd
-share/gnome/gok/nb/quit.kbd
-share/gnome/gok/nb/text-operations.kbd
-share/gnome/gok/nb/valuator.kbd
-share/gnome/gok/ne/gok-controls.kbd
-share/gnome/gok/ne/hide.kbd
-share/gnome/gok/ne/launcher.kbd
-share/gnome/gok/ne/main.kbd
-share/gnome/gok/ne/mouse.kbd
-share/gnome/gok/ne/move-resize.kbd
-share/gnome/gok/ne/numberpad.kbd
-share/gnome/gok/ne/quit.kbd
-share/gnome/gok/ne/text-operations.kbd
-share/gnome/gok/ne/valuator.kbd
-share/gnome/gok/nl/gok-controls.kbd
-share/gnome/gok/nl/hide.kbd
-share/gnome/gok/nl/launcher.kbd
-share/gnome/gok/nl/main.kbd
-share/gnome/gok/nl/mouse.kbd
-share/gnome/gok/nl/move-resize.kbd
-share/gnome/gok/nl/numberpad.kbd
-share/gnome/gok/nl/quit.kbd
-share/gnome/gok/nl/text-operations.kbd
-share/gnome/gok/nl/valuator.kbd
-share/gnome/gok/numberpad.kbd
-share/gnome/gok/oc/gok-controls.kbd
-share/gnome/gok/oc/hide.kbd
-share/gnome/gok/oc/launcher.kbd
-share/gnome/gok/oc/main.kbd
-share/gnome/gok/oc/mouse.kbd
-share/gnome/gok/oc/move-resize.kbd
-share/gnome/gok/oc/numberpad.kbd
-share/gnome/gok/oc/quit.kbd
-share/gnome/gok/oc/text-operations.kbd
-share/gnome/gok/oc/valuator.kbd
-share/gnome/gok/or/gok-controls.kbd
-share/gnome/gok/or/hide.kbd
-share/gnome/gok/or/launcher.kbd
-share/gnome/gok/or/main.kbd
-share/gnome/gok/or/mouse.kbd
-share/gnome/gok/or/move-resize.kbd
-share/gnome/gok/or/numberpad.kbd
-share/gnome/gok/or/quit.kbd
-share/gnome/gok/or/text-operations.kbd
-share/gnome/gok/or/valuator.kbd
-share/gnome/gok/pa/gok-controls.kbd
-share/gnome/gok/pa/hide.kbd
-share/gnome/gok/pa/launcher.kbd
-share/gnome/gok/pa/main.kbd
-share/gnome/gok/pa/mouse.kbd
-share/gnome/gok/pa/move-resize.kbd
-share/gnome/gok/pa/numberpad.kbd
-share/gnome/gok/pa/quit.kbd
-share/gnome/gok/pa/text-operations.kbd
-share/gnome/gok/pa/valuator.kbd
-share/gnome/gok/pl/gok-controls.kbd
-share/gnome/gok/pl/hide.kbd
-share/gnome/gok/pl/launcher.kbd
-share/gnome/gok/pl/main.kbd
-share/gnome/gok/pl/mouse.kbd
-share/gnome/gok/pl/move-resize.kbd
-share/gnome/gok/pl/numberpad.kbd
-share/gnome/gok/pl/quit.kbd
-share/gnome/gok/pl/text-operations.kbd
-share/gnome/gok/pl/valuator.kbd
-share/gnome/gok/pt/gok-controls.kbd
-share/gnome/gok/pt/hide.kbd
-share/gnome/gok/pt/launcher.kbd
-share/gnome/gok/pt/main.kbd
-share/gnome/gok/pt/mouse.kbd
-share/gnome/gok/pt/move-resize.kbd
-share/gnome/gok/pt/numberpad.kbd
-share/gnome/gok/pt/quit.kbd
-share/gnome/gok/pt/text-operations.kbd
-share/gnome/gok/pt/valuator.kbd
-share/gnome/gok/pt_BR/gok-controls.kbd
-share/gnome/gok/pt_BR/hide.kbd
-share/gnome/gok/pt_BR/launcher.kbd
-share/gnome/gok/pt_BR/main.kbd
-share/gnome/gok/pt_BR/mouse.kbd
-share/gnome/gok/pt_BR/move-resize.kbd
-share/gnome/gok/pt_BR/numberpad.kbd
-share/gnome/gok/pt_BR/quit.kbd
-share/gnome/gok/pt_BR/text-operations.kbd
-share/gnome/gok/pt_BR/valuator.kbd
-share/gnome/gok/quit.kbd
-share/gnome/gok/qwerty.kbd
-share/gnome/gok/ro/gok-controls.kbd
-share/gnome/gok/ro/hide.kbd
-share/gnome/gok/ro/launcher.kbd
-share/gnome/gok/ro/main.kbd
-share/gnome/gok/ro/mouse.kbd
-share/gnome/gok/ro/move-resize.kbd
-share/gnome/gok/ro/numberpad.kbd
-share/gnome/gok/ro/quit.kbd
-share/gnome/gok/ro/text-operations.kbd
-share/gnome/gok/ro/valuator.kbd
-share/gnome/gok/ru/gok-controls.kbd
-share/gnome/gok/ru/hide.kbd
-share/gnome/gok/ru/launcher.kbd
-share/gnome/gok/ru/main.kbd
-share/gnome/gok/ru/mouse.kbd
-share/gnome/gok/ru/move-resize.kbd
-share/gnome/gok/ru/numberpad.kbd
-share/gnome/gok/ru/quit.kbd
-share/gnome/gok/ru/text-operations.kbd
-share/gnome/gok/ru/valuator.kbd
-share/gnome/gok/rw/gok-controls.kbd
-share/gnome/gok/rw/hide.kbd
-share/gnome/gok/rw/launcher.kbd
-share/gnome/gok/rw/main.kbd
-share/gnome/gok/rw/mouse.kbd
-share/gnome/gok/rw/move-resize.kbd
-share/gnome/gok/rw/numberpad.kbd
-share/gnome/gok/rw/quit.kbd
-share/gnome/gok/rw/text-operations.kbd
-share/gnome/gok/rw/valuator.kbd
-share/gnome/gok/singlekey-automatic-scanning.xam
-share/gnome/gok/singlekey-inverse-scanning.xam
-share/gnome/gok/sk/gok-controls.kbd
-share/gnome/gok/sk/hide.kbd
-share/gnome/gok/sk/launcher.kbd
-share/gnome/gok/sk/main.kbd
-share/gnome/gok/sk/mouse.kbd
-share/gnome/gok/sk/move-resize.kbd
-share/gnome/gok/sk/numberpad.kbd
-share/gnome/gok/sk/quit.kbd
-share/gnome/gok/sk/text-operations.kbd
-share/gnome/gok/sk/valuator.kbd
-share/gnome/gok/sl/gok-controls.kbd
-share/gnome/gok/sl/hide.kbd
-share/gnome/gok/sl/launcher.kbd
-share/gnome/gok/sl/main.kbd
-share/gnome/gok/sl/mouse.kbd
-share/gnome/gok/sl/move-resize.kbd
-share/gnome/gok/sl/numberpad.kbd
-share/gnome/gok/sl/quit.kbd
-share/gnome/gok/sl/text-operations.kbd
-share/gnome/gok/sl/valuator.kbd
-share/gnome/gok/small-empty.png
-share/gnome/gok/sq/gok-controls.kbd
-share/gnome/gok/sq/hide.kbd
-share/gnome/gok/sq/launcher.kbd
-share/gnome/gok/sq/main.kbd
-share/gnome/gok/sq/mouse.kbd
-share/gnome/gok/sq/move-resize.kbd
-share/gnome/gok/sq/numberpad.kbd
-share/gnome/gok/sq/quit.kbd
-share/gnome/gok/sq/text-operations.kbd
-share/gnome/gok/sq/valuator.kbd
-share/gnome/gok/sr/gok-controls.kbd
-share/gnome/gok/sr/hide.kbd
-share/gnome/gok/sr/launcher.kbd
-share/gnome/gok/sr/main.kbd
-share/gnome/gok/sr/mouse.kbd
-share/gnome/gok/sr/move-resize.kbd
-share/gnome/gok/sr/numberpad.kbd
-share/gnome/gok/sr/quit.kbd
-share/gnome/gok/sr/text-operations.kbd
-share/gnome/gok/sr/valuator.kbd
-share/gnome/gok/sr@Latn/gok-controls.kbd
-share/gnome/gok/sr@Latn/hide.kbd
-share/gnome/gok/sr@Latn/launcher.kbd
-share/gnome/gok/sr@Latn/main.kbd
-share/gnome/gok/sr@Latn/mouse.kbd
-share/gnome/gok/sr@Latn/move-resize.kbd
-share/gnome/gok/sr@Latn/numberpad.kbd
-share/gnome/gok/sr@Latn/quit.kbd
-share/gnome/gok/sr@Latn/text-operations.kbd
-share/gnome/gok/sr@Latn/valuator.kbd
-share/gnome/gok/sv/gok-controls.kbd
-share/gnome/gok/sv/hide.kbd
-share/gnome/gok/sv/launcher.kbd
-share/gnome/gok/sv/main.kbd
-share/gnome/gok/sv/mouse.kbd
-share/gnome/gok/sv/move-resize.kbd
-share/gnome/gok/sv/numberpad.kbd
-share/gnome/gok/sv/quit.kbd
-share/gnome/gok/sv/text-operations.kbd
-share/gnome/gok/sv/valuator.kbd
-share/gnome/gok/ta/gok-controls.kbd
-share/gnome/gok/ta/hide.kbd
-share/gnome/gok/ta/launcher.kbd
-share/gnome/gok/ta/main.kbd
-share/gnome/gok/ta/mouse.kbd
-share/gnome/gok/ta/move-resize.kbd
-share/gnome/gok/ta/numberpad.kbd
-share/gnome/gok/ta/quit.kbd
-share/gnome/gok/ta/text-operations.kbd
-share/gnome/gok/ta/valuator.kbd
-share/gnome/gok/text-operations.kbd
-share/gnome/gok/tr/gok-controls.kbd
-share/gnome/gok/tr/hide.kbd
-share/gnome/gok/tr/launcher.kbd
-share/gnome/gok/tr/main.kbd
-share/gnome/gok/tr/mouse.kbd
-share/gnome/gok/tr/move-resize.kbd
-share/gnome/gok/tr/numberpad.kbd
-share/gnome/gok/tr/quit.kbd
-share/gnome/gok/tr/text-operations.kbd
-share/gnome/gok/tr/valuator.kbd
-share/gnome/gok/uk/gok-controls.kbd
-share/gnome/gok/uk/hide.kbd
-share/gnome/gok/uk/launcher.kbd
-share/gnome/gok/uk/main.kbd
-share/gnome/gok/uk/mouse.kbd
-share/gnome/gok/uk/move-resize.kbd
-share/gnome/gok/uk/numberpad.kbd
-share/gnome/gok/uk/quit.kbd
-share/gnome/gok/uk/text-operations.kbd
-share/gnome/gok/uk/valuator.kbd
-share/gnome/gok/valuator.kbd
-share/gnome/gok/value-fast-less.png
-share/gnome/gok/value-fast-more.png
-share/gnome/gok/value-less.png
-share/gnome/gok/value-max.png
-share/gnome/gok/value-min.png
-share/gnome/gok/value-more.png
-share/gnome/gok/vi/gok-controls.kbd
-share/gnome/gok/vi/hide.kbd
-share/gnome/gok/vi/launcher.kbd
-share/gnome/gok/vi/main.kbd
-share/gnome/gok/vi/mouse.kbd
-share/gnome/gok/vi/move-resize.kbd
-share/gnome/gok/vi/numberpad.kbd
-share/gnome/gok/vi/quit.kbd
-share/gnome/gok/vi/text-operations.kbd
-share/gnome/gok/vi/valuator.kbd
-share/gnome/gok/zh_CN/gok-controls.kbd
-share/gnome/gok/zh_CN/hide.kbd
-share/gnome/gok/zh_CN/launcher.kbd
-share/gnome/gok/zh_CN/main.kbd
-share/gnome/gok/zh_CN/mouse.kbd
-share/gnome/gok/zh_CN/move-resize.kbd
-share/gnome/gok/zh_CN/numberpad.kbd
-share/gnome/gok/zh_CN/quit.kbd
-share/gnome/gok/zh_CN/text-operations.kbd
-share/gnome/gok/zh_CN/valuator.kbd
-share/gnome/gok/zh_HK/gok-controls.kbd
-share/gnome/gok/zh_HK/hide.kbd
-share/gnome/gok/zh_HK/launcher.kbd
-share/gnome/gok/zh_HK/main.kbd
-share/gnome/gok/zh_HK/mouse.kbd
-share/gnome/gok/zh_HK/move-resize.kbd
-share/gnome/gok/zh_HK/numberpad.kbd
-share/gnome/gok/zh_HK/quit.kbd
-share/gnome/gok/zh_HK/text-operations.kbd
-share/gnome/gok/zh_HK/valuator.kbd
-share/gnome/gok/zh_TW/gok-controls.kbd
-share/gnome/gok/zh_TW/hide.kbd
-share/gnome/gok/zh_TW/launcher.kbd
-share/gnome/gok/zh_TW/main.kbd
-share/gnome/gok/zh_TW/mouse.kbd
-share/gnome/gok/zh_TW/move-resize.kbd
-share/gnome/gok/zh_TW/numberpad.kbd
-share/gnome/gok/zh_TW/quit.kbd
-share/gnome/gok/zh_TW/text-operations.kbd
-share/gnome/gok/zh_TW/valuator.kbd
 share/gnome/help/gok/C/gok.xml
 share/gnome/help/gok/C/legal.xml
-share/gnome/omf/gok/gok-C.omf
-share/gnome/pixmaps/gok.png
+%%DATADIR%%/East.png
+%%DATADIR%%/Keyboard.kbd
+%%DATADIR%%/NE.png
+%%DATADIR%%/NW.png
+%%DATADIR%%/North.png
+%%DATADIR%%/SE.png
+%%DATADIR%%/SW.png
+%%DATADIR%%/South.png
+%%DATADIR%%/West.png
+%%DATADIR%%/am/gok-controls.kbd
+%%DATADIR%%/am/hide.kbd
+%%DATADIR%%/am/launcher.kbd
+%%DATADIR%%/am/main.kbd
+%%DATADIR%%/am/mouse.kbd
+%%DATADIR%%/am/move-resize.kbd
+%%DATADIR%%/am/numberpad.kbd
+%%DATADIR%%/am/quit.kbd
+%%DATADIR%%/am/text-operations.kbd
+%%DATADIR%%/am/valuator.kbd
+%%DATADIR%%/ang/gok-controls.kbd
+%%DATADIR%%/ang/hide.kbd
+%%DATADIR%%/ang/launcher.kbd
+%%DATADIR%%/ang/main.kbd
+%%DATADIR%%/ang/mouse.kbd
+%%DATADIR%%/ang/move-resize.kbd
+%%DATADIR%%/ang/numberpad.kbd
+%%DATADIR%%/ang/quit.kbd
+%%DATADIR%%/ang/text-operations.kbd
+%%DATADIR%%/ang/valuator.kbd
+%%DATADIR%%/ar/gok-controls.kbd
+%%DATADIR%%/ar/hide.kbd
+%%DATADIR%%/ar/launcher.kbd
+%%DATADIR%%/ar/main.kbd
+%%DATADIR%%/ar/mouse.kbd
+%%DATADIR%%/ar/move-resize.kbd
+%%DATADIR%%/ar/numberpad.kbd
+%%DATADIR%%/ar/quit.kbd
+%%DATADIR%%/ar/text-operations.kbd
+%%DATADIR%%/ar/valuator.kbd
+%%DATADIR%%/automatic-scanning.xam
+%%DATADIR%%/az/gok-controls.kbd
+%%DATADIR%%/az/hide.kbd
+%%DATADIR%%/az/launcher.kbd
+%%DATADIR%%/az/main.kbd
+%%DATADIR%%/az/mouse.kbd
+%%DATADIR%%/az/move-resize.kbd
+%%DATADIR%%/az/numberpad.kbd
+%%DATADIR%%/az/quit.kbd
+%%DATADIR%%/az/text-operations.kbd
+%%DATADIR%%/az/valuator.kbd
+%%DATADIR%%/be/gok-controls.kbd
+%%DATADIR%%/be/hide.kbd
+%%DATADIR%%/be/launcher.kbd
+%%DATADIR%%/be/main.kbd
+%%DATADIR%%/be/mouse.kbd
+%%DATADIR%%/be/move-resize.kbd
+%%DATADIR%%/be/numberpad.kbd
+%%DATADIR%%/be/quit.kbd
+%%DATADIR%%/be/text-operations.kbd
+%%DATADIR%%/be/valuator.kbd
+%%DATADIR%%/bg/gok-controls.kbd
+%%DATADIR%%/bg/hide.kbd
+%%DATADIR%%/bg/launcher.kbd
+%%DATADIR%%/bg/main.kbd
+%%DATADIR%%/bg/mouse.kbd
+%%DATADIR%%/bg/move-resize.kbd
+%%DATADIR%%/bg/numberpad.kbd
+%%DATADIR%%/bg/quit.kbd
+%%DATADIR%%/bg/text-operations.kbd
+%%DATADIR%%/bg/valuator.kbd
+%%DATADIR%%/bn/gok-controls.kbd
+%%DATADIR%%/bn/hide.kbd
+%%DATADIR%%/bn/launcher.kbd
+%%DATADIR%%/bn/main.kbd
+%%DATADIR%%/bn/mouse.kbd
+%%DATADIR%%/bn/move-resize.kbd
+%%DATADIR%%/bn/numberpad.kbd
+%%DATADIR%%/bn/quit.kbd
+%%DATADIR%%/bn/text-operations.kbd
+%%DATADIR%%/bn/valuator.kbd
+%%DATADIR%%/bn_IN/gok-controls.kbd
+%%DATADIR%%/bn_IN/hide.kbd
+%%DATADIR%%/bn_IN/launcher.kbd
+%%DATADIR%%/bn_IN/main.kbd
+%%DATADIR%%/bn_IN/mouse.kbd
+%%DATADIR%%/bn_IN/move-resize.kbd
+%%DATADIR%%/bn_IN/numberpad.kbd
+%%DATADIR%%/bn_IN/quit.kbd
+%%DATADIR%%/bn_IN/text-operations.kbd
+%%DATADIR%%/bn_IN/valuator.kbd
+%%DATADIR%%/ca/gok-controls.kbd
+%%DATADIR%%/ca/hide.kbd
+%%DATADIR%%/ca/launcher.kbd
+%%DATADIR%%/ca/main.kbd
+%%DATADIR%%/ca/mouse.kbd
+%%DATADIR%%/ca/move-resize.kbd
+%%DATADIR%%/ca/numberpad.kbd
+%%DATADIR%%/ca/quit.kbd
+%%DATADIR%%/ca/text-operations.kbd
+%%DATADIR%%/ca/valuator.kbd
+%%DATADIR%%/cs/gok-controls.kbd
+%%DATADIR%%/cs/hide.kbd
+%%DATADIR%%/cs/launcher.kbd
+%%DATADIR%%/cs/main.kbd
+%%DATADIR%%/cs/mouse.kbd
+%%DATADIR%%/cs/move-resize.kbd
+%%DATADIR%%/cs/numberpad.kbd
+%%DATADIR%%/cs/quit.kbd
+%%DATADIR%%/cs/text-operations.kbd
+%%DATADIR%%/cs/valuator.kbd
+%%DATADIR%%/cy/gok-controls.kbd
+%%DATADIR%%/cy/hide.kbd
+%%DATADIR%%/cy/launcher.kbd
+%%DATADIR%%/cy/main.kbd
+%%DATADIR%%/cy/mouse.kbd
+%%DATADIR%%/cy/move-resize.kbd
+%%DATADIR%%/cy/numberpad.kbd
+%%DATADIR%%/cy/quit.kbd
+%%DATADIR%%/cy/text-operations.kbd
+%%DATADIR%%/cy/valuator.kbd
+%%DATADIR%%/da/gok-controls.kbd
+%%DATADIR%%/da/hide.kbd
+%%DATADIR%%/da/launcher.kbd
+%%DATADIR%%/da/main.kbd
+%%DATADIR%%/da/mouse.kbd
+%%DATADIR%%/da/move-resize.kbd
+%%DATADIR%%/da/numberpad.kbd
+%%DATADIR%%/da/quit.kbd
+%%DATADIR%%/da/text-operations.kbd
+%%DATADIR%%/da/valuator.kbd
+%%DATADIR%%/de/gok-controls.kbd
+%%DATADIR%%/de/hide.kbd
+%%DATADIR%%/de/launcher.kbd
+%%DATADIR%%/de/main.kbd
+%%DATADIR%%/de/mouse.kbd
+%%DATADIR%%/de/move-resize.kbd
+%%DATADIR%%/de/numberpad.kbd
+%%DATADIR%%/de/quit.kbd
+%%DATADIR%%/de/text-operations.kbd
+%%DATADIR%%/de/valuator.kbd
+%%DATADIR%%/dictionary.txt
+%%DATADIR%%/direct-selection.xam
+%%DATADIR%%/directed.xam
+%%DATADIR%%/dwell-selection.xam
+%%DATADIR%%/dz/gok-controls.kbd
+%%DATADIR%%/dz/hide.kbd
+%%DATADIR%%/dz/launcher.kbd
+%%DATADIR%%/dz/main.kbd
+%%DATADIR%%/dz/mouse.kbd
+%%DATADIR%%/dz/move-resize.kbd
+%%DATADIR%%/dz/numberpad.kbd
+%%DATADIR%%/dz/quit.kbd
+%%DATADIR%%/dz/text-operations.kbd
+%%DATADIR%%/dz/valuator.kbd
+%%DATADIR%%/el/gok-controls.kbd
+%%DATADIR%%/el/hide.kbd
+%%DATADIR%%/el/launcher.kbd
+%%DATADIR%%/el/main.kbd
+%%DATADIR%%/el/mouse.kbd
+%%DATADIR%%/el/move-resize.kbd
+%%DATADIR%%/el/numberpad.kbd
+%%DATADIR%%/el/quit.kbd
+%%DATADIR%%/el/text-operations.kbd
+%%DATADIR%%/el/valuator.kbd
+%%DATADIR%%/empty.png
+%%DATADIR%%/en_CA/gok-controls.kbd
+%%DATADIR%%/en_CA/hide.kbd
+%%DATADIR%%/en_CA/launcher.kbd
+%%DATADIR%%/en_CA/main.kbd
+%%DATADIR%%/en_CA/mouse.kbd
+%%DATADIR%%/en_CA/move-resize.kbd
+%%DATADIR%%/en_CA/numberpad.kbd
+%%DATADIR%%/en_CA/quit.kbd
+%%DATADIR%%/en_CA/text-operations.kbd
+%%DATADIR%%/en_CA/valuator.kbd
+%%DATADIR%%/en_GB/gok-controls.kbd
+%%DATADIR%%/en_GB/hide.kbd
+%%DATADIR%%/en_GB/launcher.kbd
+%%DATADIR%%/en_GB/main.kbd
+%%DATADIR%%/en_GB/mouse.kbd
+%%DATADIR%%/en_GB/move-resize.kbd
+%%DATADIR%%/en_GB/numberpad.kbd
+%%DATADIR%%/en_GB/quit.kbd
+%%DATADIR%%/en_GB/text-operations.kbd
+%%DATADIR%%/en_GB/valuator.kbd
+%%DATADIR%%/es/gok-controls.kbd
+%%DATADIR%%/es/hide.kbd
+%%DATADIR%%/es/launcher.kbd
+%%DATADIR%%/es/main.kbd
+%%DATADIR%%/es/mouse.kbd
+%%DATADIR%%/es/move-resize.kbd
+%%DATADIR%%/es/numberpad.kbd
+%%DATADIR%%/es/quit.kbd
+%%DATADIR%%/es/text-operations.kbd
+%%DATADIR%%/es/valuator.kbd
+%%DATADIR%%/et/gok-controls.kbd
+%%DATADIR%%/et/hide.kbd
+%%DATADIR%%/et/launcher.kbd
+%%DATADIR%%/et/main.kbd
+%%DATADIR%%/et/mouse.kbd
+%%DATADIR%%/et/move-resize.kbd
+%%DATADIR%%/et/numberpad.kbd
+%%DATADIR%%/et/quit.kbd
+%%DATADIR%%/et/text-operations.kbd
+%%DATADIR%%/et/valuator.kbd
+%%DATADIR%%/eu/gok-controls.kbd
+%%DATADIR%%/eu/hide.kbd
+%%DATADIR%%/eu/launcher.kbd
+%%DATADIR%%/eu/main.kbd
+%%DATADIR%%/eu/mouse.kbd
+%%DATADIR%%/eu/move-resize.kbd
+%%DATADIR%%/eu/numberpad.kbd
+%%DATADIR%%/eu/quit.kbd
+%%DATADIR%%/eu/text-operations.kbd
+%%DATADIR%%/eu/valuator.kbd
+%%DATADIR%%/fa/gok-controls.kbd
+%%DATADIR%%/fa/hide.kbd
+%%DATADIR%%/fa/launcher.kbd
+%%DATADIR%%/fa/main.kbd
+%%DATADIR%%/fa/mouse.kbd
+%%DATADIR%%/fa/move-resize.kbd
+%%DATADIR%%/fa/numberpad.kbd
+%%DATADIR%%/fa/quit.kbd
+%%DATADIR%%/fa/text-operations.kbd
+%%DATADIR%%/fa/valuator.kbd
+%%DATADIR%%/fi/gok-controls.kbd
+%%DATADIR%%/fi/hide.kbd
+%%DATADIR%%/fi/launcher.kbd
+%%DATADIR%%/fi/main.kbd
+%%DATADIR%%/fi/mouse.kbd
+%%DATADIR%%/fi/move-resize.kbd
+%%DATADIR%%/fi/numberpad.kbd
+%%DATADIR%%/fi/quit.kbd
+%%DATADIR%%/fi/text-operations.kbd
+%%DATADIR%%/fi/valuator.kbd
+%%DATADIR%%/fr/gok-controls.kbd
+%%DATADIR%%/fr/hide.kbd
+%%DATADIR%%/fr/launcher.kbd
+%%DATADIR%%/fr/main.kbd
+%%DATADIR%%/fr/mouse.kbd
+%%DATADIR%%/fr/move-resize.kbd
+%%DATADIR%%/fr/numberpad.kbd
+%%DATADIR%%/fr/quit.kbd
+%%DATADIR%%/fr/text-operations.kbd
+%%DATADIR%%/fr/valuator.kbd
+%%DATADIR%%/ga/gok-controls.kbd
+%%DATADIR%%/ga/hide.kbd
+%%DATADIR%%/ga/launcher.kbd
+%%DATADIR%%/ga/main.kbd
+%%DATADIR%%/ga/mouse.kbd
+%%DATADIR%%/ga/move-resize.kbd
+%%DATADIR%%/ga/numberpad.kbd
+%%DATADIR%%/ga/quit.kbd
+%%DATADIR%%/ga/text-operations.kbd
+%%DATADIR%%/ga/valuator.kbd
+%%DATADIR%%/gl/gok-controls.kbd
+%%DATADIR%%/gl/hide.kbd
+%%DATADIR%%/gl/launcher.kbd
+%%DATADIR%%/gl/main.kbd
+%%DATADIR%%/gl/mouse.kbd
+%%DATADIR%%/gl/move-resize.kbd
+%%DATADIR%%/gl/numberpad.kbd
+%%DATADIR%%/gl/quit.kbd
+%%DATADIR%%/gl/text-operations.kbd
+%%DATADIR%%/gl/valuator.kbd
+%%DATADIR%%/glade/gok.glade2
+%%DATADIR%%/gok-controls.kbd
+%%DATADIR%%/gok.rc
+%%DATADIR%%/goklogo.png
+%%DATADIR%%/goksound1.wav
+%%DATADIR%%/goksound2.wav
+%%DATADIR%%/gu/gok-controls.kbd
+%%DATADIR%%/gu/hide.kbd
+%%DATADIR%%/gu/launcher.kbd
+%%DATADIR%%/gu/main.kbd
+%%DATADIR%%/gu/mouse.kbd
+%%DATADIR%%/gu/move-resize.kbd
+%%DATADIR%%/gu/numberpad.kbd
+%%DATADIR%%/gu/quit.kbd
+%%DATADIR%%/gu/text-operations.kbd
+%%DATADIR%%/gu/valuator.kbd
+%%DATADIR%%/hi/gok-controls.kbd
+%%DATADIR%%/hi/hide.kbd
+%%DATADIR%%/hi/launcher.kbd
+%%DATADIR%%/hi/main.kbd
+%%DATADIR%%/hi/mouse.kbd
+%%DATADIR%%/hi/move-resize.kbd
+%%DATADIR%%/hi/numberpad.kbd
+%%DATADIR%%/hi/quit.kbd
+%%DATADIR%%/hi/text-operations.kbd
+%%DATADIR%%/hi/valuator.kbd
+%%DATADIR%%/hide.kbd
+%%DATADIR%%/hr/gok-controls.kbd
+%%DATADIR%%/hr/hide.kbd
+%%DATADIR%%/hr/launcher.kbd
+%%DATADIR%%/hr/main.kbd
+%%DATADIR%%/hr/mouse.kbd
+%%DATADIR%%/hr/move-resize.kbd
+%%DATADIR%%/hr/numberpad.kbd
+%%DATADIR%%/hr/quit.kbd
+%%DATADIR%%/hr/text-operations.kbd
+%%DATADIR%%/hr/valuator.kbd
+%%DATADIR%%/hu/gok-controls.kbd
+%%DATADIR%%/hu/hide.kbd
+%%DATADIR%%/hu/launcher.kbd
+%%DATADIR%%/hu/main.kbd
+%%DATADIR%%/hu/mouse.kbd
+%%DATADIR%%/hu/move-resize.kbd
+%%DATADIR%%/hu/numberpad.kbd
+%%DATADIR%%/hu/quit.kbd
+%%DATADIR%%/hu/text-operations.kbd
+%%DATADIR%%/hu/valuator.kbd
+%%DATADIR%%/id/gok-controls.kbd
+%%DATADIR%%/id/hide.kbd
+%%DATADIR%%/id/launcher.kbd
+%%DATADIR%%/id/main.kbd
+%%DATADIR%%/id/mouse.kbd
+%%DATADIR%%/id/move-resize.kbd
+%%DATADIR%%/id/numberpad.kbd
+%%DATADIR%%/id/quit.kbd
+%%DATADIR%%/id/text-operations.kbd
+%%DATADIR%%/id/valuator.kbd
+%%DATADIR%%/inverse-scanning.xam
+%%DATADIR%%/it/gok-controls.kbd
+%%DATADIR%%/it/hide.kbd
+%%DATADIR%%/it/launcher.kbd
+%%DATADIR%%/it/main.kbd
+%%DATADIR%%/it/mouse.kbd
+%%DATADIR%%/it/move-resize.kbd
+%%DATADIR%%/it/numberpad.kbd
+%%DATADIR%%/it/quit.kbd
+%%DATADIR%%/it/text-operations.kbd
+%%DATADIR%%/it/valuator.kbd
+%%DATADIR%%/ja/gok-controls.kbd
+%%DATADIR%%/ja/hide.kbd
+%%DATADIR%%/ja/launcher.kbd
+%%DATADIR%%/ja/main.kbd
+%%DATADIR%%/ja/mouse.kbd
+%%DATADIR%%/ja/move-resize.kbd
+%%DATADIR%%/ja/numberpad.kbd
+%%DATADIR%%/ja/quit.kbd
+%%DATADIR%%/ja/text-operations.kbd
+%%DATADIR%%/ja/valuator.kbd
+%%DATADIR%%/ka/gok-controls.kbd
+%%DATADIR%%/ka/hide.kbd
+%%DATADIR%%/ka/launcher.kbd
+%%DATADIR%%/ka/main.kbd
+%%DATADIR%%/ka/mouse.kbd
+%%DATADIR%%/ka/move-resize.kbd
+%%DATADIR%%/ka/numberpad.kbd
+%%DATADIR%%/ka/quit.kbd
+%%DATADIR%%/ka/text-operations.kbd
+%%DATADIR%%/ka/valuator.kbd
+%%DATADIR%%/ko/gok-controls.kbd
+%%DATADIR%%/ko/hide.kbd
+%%DATADIR%%/ko/launcher.kbd
+%%DATADIR%%/ko/main.kbd
+%%DATADIR%%/ko/mouse.kbd
+%%DATADIR%%/ko/move-resize.kbd
+%%DATADIR%%/ko/numberpad.kbd
+%%DATADIR%%/ko/quit.kbd
+%%DATADIR%%/ko/text-operations.kbd
+%%DATADIR%%/ko/valuator.kbd
+%%DATADIR%%/ku/gok-controls.kbd
+%%DATADIR%%/ku/hide.kbd
+%%DATADIR%%/ku/launcher.kbd
+%%DATADIR%%/ku/main.kbd
+%%DATADIR%%/ku/mouse.kbd
+%%DATADIR%%/ku/move-resize.kbd
+%%DATADIR%%/ku/numberpad.kbd
+%%DATADIR%%/ku/quit.kbd
+%%DATADIR%%/ku/text-operations.kbd
+%%DATADIR%%/ku/valuator.kbd
+%%DATADIR%%/latched.png
+%%DATADIR%%/launcher.kbd
+%%DATADIR%%/locked.png
+%%DATADIR%%/lt/gok-controls.kbd
+%%DATADIR%%/lt/hide.kbd
+%%DATADIR%%/lt/launcher.kbd
+%%DATADIR%%/lt/main.kbd
+%%DATADIR%%/lt/mouse.kbd
+%%DATADIR%%/lt/move-resize.kbd
+%%DATADIR%%/lt/numberpad.kbd
+%%DATADIR%%/lt/quit.kbd
+%%DATADIR%%/lt/text-operations.kbd
+%%DATADIR%%/lt/valuator.kbd
+%%DATADIR%%/lv/gok-controls.kbd
+%%DATADIR%%/lv/hide.kbd
+%%DATADIR%%/lv/launcher.kbd
+%%DATADIR%%/lv/main.kbd
+%%DATADIR%%/lv/mouse.kbd
+%%DATADIR%%/lv/move-resize.kbd
+%%DATADIR%%/lv/numberpad.kbd
+%%DATADIR%%/lv/quit.kbd
+%%DATADIR%%/lv/text-operations.kbd
+%%DATADIR%%/lv/valuator.kbd
+%%DATADIR%%/main.kbd
+%%DATADIR%%/manage.kbd
+%%DATADIR%%/mk/gok-controls.kbd
+%%DATADIR%%/mk/hide.kbd
+%%DATADIR%%/mk/launcher.kbd
+%%DATADIR%%/mk/main.kbd
+%%DATADIR%%/mk/mouse.kbd
+%%DATADIR%%/mk/move-resize.kbd
+%%DATADIR%%/mk/numberpad.kbd
+%%DATADIR%%/mk/quit.kbd
+%%DATADIR%%/mk/text-operations.kbd
+%%DATADIR%%/mk/valuator.kbd
+%%DATADIR%%/ml/gok-controls.kbd
+%%DATADIR%%/ml/hide.kbd
+%%DATADIR%%/ml/launcher.kbd
+%%DATADIR%%/ml/main.kbd
+%%DATADIR%%/ml/mouse.kbd
+%%DATADIR%%/ml/move-resize.kbd
+%%DATADIR%%/ml/numberpad.kbd
+%%DATADIR%%/ml/quit.kbd
+%%DATADIR%%/ml/text-operations.kbd
+%%DATADIR%%/ml/valuator.kbd
+%%DATADIR%%/mn/gok-controls.kbd
+%%DATADIR%%/mn/hide.kbd
+%%DATADIR%%/mn/launcher.kbd
+%%DATADIR%%/mn/main.kbd
+%%DATADIR%%/mn/mouse.kbd
+%%DATADIR%%/mn/move-resize.kbd
+%%DATADIR%%/mn/numberpad.kbd
+%%DATADIR%%/mn/quit.kbd
+%%DATADIR%%/mn/text-operations.kbd
+%%DATADIR%%/mn/valuator.kbd
+%%DATADIR%%/mouse.kbd
+%%DATADIR%%/move-resize.kbd
+%%DATADIR%%/mr/gok-controls.kbd
+%%DATADIR%%/mr/hide.kbd
+%%DATADIR%%/mr/launcher.kbd
+%%DATADIR%%/mr/main.kbd
+%%DATADIR%%/mr/mouse.kbd
+%%DATADIR%%/mr/move-resize.kbd
+%%DATADIR%%/mr/numberpad.kbd
+%%DATADIR%%/mr/quit.kbd
+%%DATADIR%%/mr/text-operations.kbd
+%%DATADIR%%/mr/valuator.kbd
+%%DATADIR%%/ms/gok-controls.kbd
+%%DATADIR%%/ms/hide.kbd
+%%DATADIR%%/ms/launcher.kbd
+%%DATADIR%%/ms/main.kbd
+%%DATADIR%%/ms/mouse.kbd
+%%DATADIR%%/ms/move-resize.kbd
+%%DATADIR%%/ms/numberpad.kbd
+%%DATADIR%%/ms/quit.kbd
+%%DATADIR%%/ms/text-operations.kbd
+%%DATADIR%%/ms/valuator.kbd
+%%DATADIR%%/nb/gok-controls.kbd
+%%DATADIR%%/nb/hide.kbd
+%%DATADIR%%/nb/launcher.kbd
+%%DATADIR%%/nb/main.kbd
+%%DATADIR%%/nb/mouse.kbd
+%%DATADIR%%/nb/move-resize.kbd
+%%DATADIR%%/nb/numberpad.kbd
+%%DATADIR%%/nb/quit.kbd
+%%DATADIR%%/nb/text-operations.kbd
+%%DATADIR%%/nb/valuator.kbd
+%%DATADIR%%/ne/gok-controls.kbd
+%%DATADIR%%/ne/hide.kbd
+%%DATADIR%%/ne/launcher.kbd
+%%DATADIR%%/ne/main.kbd
+%%DATADIR%%/ne/mouse.kbd
+%%DATADIR%%/ne/move-resize.kbd
+%%DATADIR%%/ne/numberpad.kbd
+%%DATADIR%%/ne/quit.kbd
+%%DATADIR%%/ne/text-operations.kbd
+%%DATADIR%%/ne/valuator.kbd
+%%DATADIR%%/nl/gok-controls.kbd
+%%DATADIR%%/nl/hide.kbd
+%%DATADIR%%/nl/launcher.kbd
+%%DATADIR%%/nl/main.kbd
+%%DATADIR%%/nl/mouse.kbd
+%%DATADIR%%/nl/move-resize.kbd
+%%DATADIR%%/nl/numberpad.kbd
+%%DATADIR%%/nl/quit.kbd
+%%DATADIR%%/nl/text-operations.kbd
+%%DATADIR%%/nl/valuator.kbd
+%%DATADIR%%/numberpad.kbd
+%%DATADIR%%/oc/gok-controls.kbd
+%%DATADIR%%/oc/hide.kbd
+%%DATADIR%%/oc/launcher.kbd
+%%DATADIR%%/oc/main.kbd
+%%DATADIR%%/oc/mouse.kbd
+%%DATADIR%%/oc/move-resize.kbd
+%%DATADIR%%/oc/numberpad.kbd
+%%DATADIR%%/oc/quit.kbd
+%%DATADIR%%/oc/text-operations.kbd
+%%DATADIR%%/oc/valuator.kbd
+%%DATADIR%%/or/gok-controls.kbd
+%%DATADIR%%/or/hide.kbd
+%%DATADIR%%/or/launcher.kbd
+%%DATADIR%%/or/main.kbd
+%%DATADIR%%/or/mouse.kbd
+%%DATADIR%%/or/move-resize.kbd
+%%DATADIR%%/or/numberpad.kbd
+%%DATADIR%%/or/quit.kbd
+%%DATADIR%%/or/text-operations.kbd
+%%DATADIR%%/or/valuator.kbd
+%%DATADIR%%/pa/gok-controls.kbd
+%%DATADIR%%/pa/hide.kbd
+%%DATADIR%%/pa/launcher.kbd
+%%DATADIR%%/pa/main.kbd
+%%DATADIR%%/pa/mouse.kbd
+%%DATADIR%%/pa/move-resize.kbd
+%%DATADIR%%/pa/numberpad.kbd
+%%DATADIR%%/pa/quit.kbd
+%%DATADIR%%/pa/text-operations.kbd
+%%DATADIR%%/pa/valuator.kbd
+%%DATADIR%%/pl/gok-controls.kbd
+%%DATADIR%%/pl/hide.kbd
+%%DATADIR%%/pl/launcher.kbd
+%%DATADIR%%/pl/main.kbd
+%%DATADIR%%/pl/mouse.kbd
+%%DATADIR%%/pl/move-resize.kbd
+%%DATADIR%%/pl/numberpad.kbd
+%%DATADIR%%/pl/quit.kbd
+%%DATADIR%%/pl/text-operations.kbd
+%%DATADIR%%/pl/valuator.kbd
+%%DATADIR%%/pt/gok-controls.kbd
+%%DATADIR%%/pt/hide.kbd
+%%DATADIR%%/pt/launcher.kbd
+%%DATADIR%%/pt/main.kbd
+%%DATADIR%%/pt/mouse.kbd
+%%DATADIR%%/pt/move-resize.kbd
+%%DATADIR%%/pt/numberpad.kbd
+%%DATADIR%%/pt/quit.kbd
+%%DATADIR%%/pt/text-operations.kbd
+%%DATADIR%%/pt/valuator.kbd
+%%DATADIR%%/pt_BR/gok-controls.kbd
+%%DATADIR%%/pt_BR/hide.kbd
+%%DATADIR%%/pt_BR/launcher.kbd
+%%DATADIR%%/pt_BR/main.kbd
+%%DATADIR%%/pt_BR/mouse.kbd
+%%DATADIR%%/pt_BR/move-resize.kbd
+%%DATADIR%%/pt_BR/numberpad.kbd
+%%DATADIR%%/pt_BR/quit.kbd
+%%DATADIR%%/pt_BR/text-operations.kbd
+%%DATADIR%%/pt_BR/valuator.kbd
+%%DATADIR%%/quit.kbd
+%%DATADIR%%/qwerty.kbd
+%%DATADIR%%/ro/gok-controls.kbd
+%%DATADIR%%/ro/hide.kbd
+%%DATADIR%%/ro/launcher.kbd
+%%DATADIR%%/ro/main.kbd
+%%DATADIR%%/ro/mouse.kbd
+%%DATADIR%%/ro/move-resize.kbd
+%%DATADIR%%/ro/numberpad.kbd
+%%DATADIR%%/ro/quit.kbd
+%%DATADIR%%/ro/text-operations.kbd
+%%DATADIR%%/ro/valuator.kbd
+%%DATADIR%%/ru/gok-controls.kbd
+%%DATADIR%%/ru/hide.kbd
+%%DATADIR%%/ru/launcher.kbd
+%%DATADIR%%/ru/main.kbd
+%%DATADIR%%/ru/mouse.kbd
+%%DATADIR%%/ru/move-resize.kbd
+%%DATADIR%%/ru/numberpad.kbd
+%%DATADIR%%/ru/quit.kbd
+%%DATADIR%%/ru/text-operations.kbd
+%%DATADIR%%/ru/valuator.kbd
+%%DATADIR%%/rw/gok-controls.kbd
+%%DATADIR%%/rw/hide.kbd
+%%DATADIR%%/rw/launcher.kbd
+%%DATADIR%%/rw/main.kbd
+%%DATADIR%%/rw/mouse.kbd
+%%DATADIR%%/rw/move-resize.kbd
+%%DATADIR%%/rw/numberpad.kbd
+%%DATADIR%%/rw/quit.kbd
+%%DATADIR%%/rw/text-operations.kbd
+%%DATADIR%%/rw/valuator.kbd
+%%DATADIR%%/si/gok-controls.kbd
+%%DATADIR%%/si/hide.kbd
+%%DATADIR%%/si/launcher.kbd
+%%DATADIR%%/si/main.kbd
+%%DATADIR%%/si/mouse.kbd
+%%DATADIR%%/si/move-resize.kbd
+%%DATADIR%%/si/numberpad.kbd
+%%DATADIR%%/si/quit.kbd
+%%DATADIR%%/si/text-operations.kbd
+%%DATADIR%%/si/valuator.kbd
+%%DATADIR%%/singlekey-automatic-scanning.xam
+%%DATADIR%%/singlekey-inverse-scanning.xam
+%%DATADIR%%/sk/gok-controls.kbd
+%%DATADIR%%/sk/hide.kbd
+%%DATADIR%%/sk/launcher.kbd
+%%DATADIR%%/sk/main.kbd
+%%DATADIR%%/sk/mouse.kbd
+%%DATADIR%%/sk/move-resize.kbd
+%%DATADIR%%/sk/numberpad.kbd
+%%DATADIR%%/sk/quit.kbd
+%%DATADIR%%/sk/text-operations.kbd
+%%DATADIR%%/sk/valuator.kbd
+%%DATADIR%%/sl/gok-controls.kbd
+%%DATADIR%%/sl/hide.kbd
+%%DATADIR%%/sl/launcher.kbd
+%%DATADIR%%/sl/main.kbd
+%%DATADIR%%/sl/mouse.kbd
+%%DATADIR%%/sl/move-resize.kbd
+%%DATADIR%%/sl/numberpad.kbd
+%%DATADIR%%/sl/quit.kbd
+%%DATADIR%%/sl/text-operations.kbd
+%%DATADIR%%/sl/valuator.kbd
+%%DATADIR%%/small-empty.png
+%%DATADIR%%/sq/gok-controls.kbd
+%%DATADIR%%/sq/hide.kbd
+%%DATADIR%%/sq/launcher.kbd
+%%DATADIR%%/sq/main.kbd
+%%DATADIR%%/sq/mouse.kbd
+%%DATADIR%%/sq/move-resize.kbd
+%%DATADIR%%/sq/numberpad.kbd
+%%DATADIR%%/sq/quit.kbd
+%%DATADIR%%/sq/text-operations.kbd
+%%DATADIR%%/sq/valuator.kbd
+%%DATADIR%%/sr/gok-controls.kbd
+%%DATADIR%%/sr/hide.kbd
+%%DATADIR%%/sr/launcher.kbd
+%%DATADIR%%/sr/main.kbd
+%%DATADIR%%/sr/mouse.kbd
+%%DATADIR%%/sr/move-resize.kbd
+%%DATADIR%%/sr/numberpad.kbd
+%%DATADIR%%/sr/quit.kbd
+%%DATADIR%%/sr/text-operations.kbd
+%%DATADIR%%/sr/valuator.kbd
+%%DATADIR%%/sr@Latn/gok-controls.kbd
+%%DATADIR%%/sr@Latn/hide.kbd
+%%DATADIR%%/sr@Latn/launcher.kbd
+%%DATADIR%%/sr@Latn/main.kbd
+%%DATADIR%%/sr@Latn/mouse.kbd
+%%DATADIR%%/sr@Latn/move-resize.kbd
+%%DATADIR%%/sr@Latn/numberpad.kbd
+%%DATADIR%%/sr@Latn/quit.kbd
+%%DATADIR%%/sr@Latn/text-operations.kbd
+%%DATADIR%%/sr@Latn/valuator.kbd
+%%DATADIR%%/sv/gok-controls.kbd
+%%DATADIR%%/sv/hide.kbd
+%%DATADIR%%/sv/launcher.kbd
+%%DATADIR%%/sv/main.kbd
+%%DATADIR%%/sv/mouse.kbd
+%%DATADIR%%/sv/move-resize.kbd
+%%DATADIR%%/sv/numberpad.kbd
+%%DATADIR%%/sv/quit.kbd
+%%DATADIR%%/sv/text-operations.kbd
+%%DATADIR%%/sv/valuator.kbd
+%%DATADIR%%/ta/gok-controls.kbd
+%%DATADIR%%/ta/hide.kbd
+%%DATADIR%%/ta/launcher.kbd
+%%DATADIR%%/ta/main.kbd
+%%DATADIR%%/ta/mouse.kbd
+%%DATADIR%%/ta/move-resize.kbd
+%%DATADIR%%/ta/numberpad.kbd
+%%DATADIR%%/ta/quit.kbd
+%%DATADIR%%/ta/text-operations.kbd
+%%DATADIR%%/ta/valuator.kbd
+%%DATADIR%%/te/gok-controls.kbd
+%%DATADIR%%/te/hide.kbd
+%%DATADIR%%/te/launcher.kbd
+%%DATADIR%%/te/main.kbd
+%%DATADIR%%/te/mouse.kbd
+%%DATADIR%%/te/move-resize.kbd
+%%DATADIR%%/te/numberpad.kbd
+%%DATADIR%%/te/quit.kbd
+%%DATADIR%%/te/text-operations.kbd
+%%DATADIR%%/te/valuator.kbd
+%%DATADIR%%/text-operations.kbd
+%%DATADIR%%/th/gok-controls.kbd
+%%DATADIR%%/th/hide.kbd
+%%DATADIR%%/th/launcher.kbd
+%%DATADIR%%/th/main.kbd
+%%DATADIR%%/th/mouse.kbd
+%%DATADIR%%/th/move-resize.kbd
+%%DATADIR%%/th/numberpad.kbd
+%%DATADIR%%/th/quit.kbd
+%%DATADIR%%/th/text-operations.kbd
+%%DATADIR%%/th/valuator.kbd
+%%DATADIR%%/tr/gok-controls.kbd
+%%DATADIR%%/tr/hide.kbd
+%%DATADIR%%/tr/launcher.kbd
+%%DATADIR%%/tr/main.kbd
+%%DATADIR%%/tr/mouse.kbd
+%%DATADIR%%/tr/move-resize.kbd
+%%DATADIR%%/tr/numberpad.kbd
+%%DATADIR%%/tr/quit.kbd
+%%DATADIR%%/tr/text-operations.kbd
+%%DATADIR%%/tr/valuator.kbd
+%%DATADIR%%/uk/gok-controls.kbd
+%%DATADIR%%/uk/hide.kbd
+%%DATADIR%%/uk/launcher.kbd
+%%DATADIR%%/uk/main.kbd
+%%DATADIR%%/uk/mouse.kbd
+%%DATADIR%%/uk/move-resize.kbd
+%%DATADIR%%/uk/numberpad.kbd
+%%DATADIR%%/uk/quit.kbd
+%%DATADIR%%/uk/text-operations.kbd
+%%DATADIR%%/uk/valuator.kbd
+%%DATADIR%%/valuator.kbd
+%%DATADIR%%/value-fast-less.png
+%%DATADIR%%/value-fast-more.png
+%%DATADIR%%/value-less.png
+%%DATADIR%%/value-max.png
+%%DATADIR%%/value-min.png
+%%DATADIR%%/value-more.png
+%%DATADIR%%/vi/gok-controls.kbd
+%%DATADIR%%/vi/hide.kbd
+%%DATADIR%%/vi/launcher.kbd
+%%DATADIR%%/vi/main.kbd
+%%DATADIR%%/vi/mouse.kbd
+%%DATADIR%%/vi/move-resize.kbd
+%%DATADIR%%/vi/numberpad.kbd
+%%DATADIR%%/vi/quit.kbd
+%%DATADIR%%/vi/text-operations.kbd
+%%DATADIR%%/vi/valuator.kbd
+%%DATADIR%%/zh_CN/gok-controls.kbd
+%%DATADIR%%/zh_CN/hide.kbd
+%%DATADIR%%/zh_CN/launcher.kbd
+%%DATADIR%%/zh_CN/main.kbd
+%%DATADIR%%/zh_CN/mouse.kbd
+%%DATADIR%%/zh_CN/move-resize.kbd
+%%DATADIR%%/zh_CN/numberpad.kbd
+%%DATADIR%%/zh_CN/quit.kbd
+%%DATADIR%%/zh_CN/text-operations.kbd
+%%DATADIR%%/zh_CN/valuator.kbd
+%%DATADIR%%/zh_HK/gok-controls.kbd
+%%DATADIR%%/zh_HK/hide.kbd
+%%DATADIR%%/zh_HK/launcher.kbd
+%%DATADIR%%/zh_HK/main.kbd
+%%DATADIR%%/zh_HK/mouse.kbd
+%%DATADIR%%/zh_HK/move-resize.kbd
+%%DATADIR%%/zh_HK/numberpad.kbd
+%%DATADIR%%/zh_HK/quit.kbd
+%%DATADIR%%/zh_HK/text-operations.kbd
+%%DATADIR%%/zh_HK/valuator.kbd
+%%DATADIR%%/zh_TW/gok-controls.kbd
+%%DATADIR%%/zh_TW/hide.kbd
+%%DATADIR%%/zh_TW/launcher.kbd
+%%DATADIR%%/zh_TW/main.kbd
+%%DATADIR%%/zh_TW/mouse.kbd
+%%DATADIR%%/zh_TW/move-resize.kbd
+%%DATADIR%%/zh_TW/numberpad.kbd
+%%DATADIR%%/zh_TW/quit.kbd
+%%DATADIR%%/zh_TW/text-operations.kbd
+%%DATADIR%%/zh_TW/valuator.kbd
 share/icons/hicolor/48x48/apps/gok.png
 share/locale/am/LC_MESSAGES/gok.mo
 share/locale/ang/LC_MESSAGES/gok.mo
@@ -834,6 +862,7 @@ share/locale/pt_BR/LC_MESSAGES/gok.mo
 share/locale/ro/LC_MESSAGES/gok.mo
 share/locale/ru/LC_MESSAGES/gok.mo
 share/locale/rw/LC_MESSAGES/gok.mo
+share/locale/si/LC_MESSAGES/gok.mo
 share/locale/sk/LC_MESSAGES/gok.mo
 share/locale/sl/LC_MESSAGES/gok.mo
 share/locale/sq/LC_MESSAGES/gok.mo
@@ -841,87 +870,98 @@ share/locale/sr/LC_MESSAGES/gok.mo
 share/locale/sr@Latn/LC_MESSAGES/gok.mo
 share/locale/sv/LC_MESSAGES/gok.mo
 share/locale/ta/LC_MESSAGES/gok.mo
+share/locale/te/LC_MESSAGES/gok.mo
+share/locale/th/LC_MESSAGES/gok.mo
 share/locale/tr/LC_MESSAGES/gok.mo
 share/locale/uk/LC_MESSAGES/gok.mo
 share/locale/vi/LC_MESSAGES/gok.mo
 share/locale/zh_CN/LC_MESSAGES/gok.mo
 share/locale/zh_HK/LC_MESSAGES/gok.mo
 share/locale/zh_TW/LC_MESSAGES/gok.mo
-@dirrm share/gnome/omf/gok
+share/omf/gok/gok-C.omf
+share/pixmaps/gok.png
+@dirrm share/omf/gok
+@dirrm %%DATADIR%%/zh_TW
+@dirrm %%DATADIR%%/zh_HK
+@dirrm %%DATADIR%%/zh_CN
+@dirrm %%DATADIR%%/vi
+@dirrm %%DATADIR%%/uk
+@dirrm %%DATADIR%%/tr
+@dirrm %%DATADIR%%/th
+@dirrm %%DATADIR%%/te
+@dirrm %%DATADIR%%/ta
+@dirrm %%DATADIR%%/sv
+@dirrm %%DATADIR%%/sr@Latn
+@dirrm %%DATADIR%%/sr
+@dirrm %%DATADIR%%/sq
+@dirrm %%DATADIR%%/sl
+@dirrm %%DATADIR%%/sk
+@dirrm %%DATADIR%%/si
+@dirrm %%DATADIR%%/rw
+@dirrm %%DATADIR%%/ru
+@dirrm %%DATADIR%%/ro
+@dirrm %%DATADIR%%/pt_BR
+@dirrm %%DATADIR%%/pt
+@dirrm %%DATADIR%%/pl
+@dirrm %%DATADIR%%/pa
+@dirrm %%DATADIR%%/or
+@dirrm %%DATADIR%%/oc
+@dirrm %%DATADIR%%/nl
+@dirrm %%DATADIR%%/ne
+@dirrm %%DATADIR%%/nb
+@dirrm %%DATADIR%%/ms
+@dirrm %%DATADIR%%/mr
+@dirrm %%DATADIR%%/mn
+@dirrm %%DATADIR%%/ml
+@dirrm %%DATADIR%%/mk
+@dirrm %%DATADIR%%/lv
+@dirrm %%DATADIR%%/lt
+@dirrm %%DATADIR%%/ku
+@dirrm %%DATADIR%%/ko
+@dirrm %%DATADIR%%/ka
+@dirrm %%DATADIR%%/ja
+@dirrm %%DATADIR%%/it
+@dirrm %%DATADIR%%/id
+@dirrm %%DATADIR%%/hu
+@dirrm %%DATADIR%%/hr
+@dirrm %%DATADIR%%/hi
+@dirrm %%DATADIR%%/gu
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/gl
+@dirrm %%DATADIR%%/ga
+@dirrm %%DATADIR%%/fr
+@dirrm %%DATADIR%%/fi
+@dirrm %%DATADIR%%/fa
+@dirrm %%DATADIR%%/eu
+@dirrm %%DATADIR%%/et
+@dirrm %%DATADIR%%/es
+@dirrm %%DATADIR%%/en_GB
+@dirrm %%DATADIR%%/en_CA
+@dirrm %%DATADIR%%/el
+@dirrm %%DATADIR%%/dz
+@dirrm %%DATADIR%%/de
+@dirrm %%DATADIR%%/da
+@dirrm %%DATADIR%%/cy
+@dirrm %%DATADIR%%/cs
+@dirrm %%DATADIR%%/ca
+@dirrm %%DATADIR%%/bn_IN
+@dirrm %%DATADIR%%/bn
+@dirrm %%DATADIR%%/bg
+@dirrm %%DATADIR%%/be
+@dirrm %%DATADIR%%/az
+@dirrm %%DATADIR%%/ar
+@dirrm %%DATADIR%%/ang
+@dirrm %%DATADIR%%/am
+@dirrm %%DATADIR%%
 @dirrm share/gnome/help/gok/C
 @dirrm share/gnome/help/gok
-@dirrm share/gnome/gok/zh_TW
-@dirrm share/gnome/gok/zh_HK
-@dirrm share/gnome/gok/zh_CN
-@dirrm share/gnome/gok/vi
-@dirrm share/gnome/gok/uk
-@dirrm share/gnome/gok/tr
-@dirrm share/gnome/gok/ta
-@dirrm share/gnome/gok/sv
-@dirrm share/gnome/gok/sr@Latn
-@dirrm share/gnome/gok/sr
-@dirrm share/gnome/gok/sq
-@dirrm share/gnome/gok/sl
-@dirrm share/gnome/gok/sk
-@dirrm share/gnome/gok/rw
-@dirrm share/gnome/gok/ru
-@dirrm share/gnome/gok/ro
-@dirrm share/gnome/gok/pt_BR
-@dirrm share/gnome/gok/pt
-@dirrm share/gnome/gok/pl
-@dirrm share/gnome/gok/pa
-@dirrm share/gnome/gok/or
-@dirrm share/gnome/gok/oc
-@dirrm share/gnome/gok/nl
-@dirrm share/gnome/gok/ne
-@dirrm share/gnome/gok/nb
-@dirrm share/gnome/gok/ms
-@dirrm share/gnome/gok/mr
-@dirrm share/gnome/gok/mn
-@dirrm share/gnome/gok/ml
-@dirrm share/gnome/gok/mk
-@dirrm share/gnome/gok/lv
-@dirrm share/gnome/gok/lt
-@dirrm share/gnome/gok/ku
-@dirrm share/gnome/gok/ko
-@dirrm share/gnome/gok/ka
-@dirrm share/gnome/gok/ja
-@dirrm share/gnome/gok/it
-@dirrm share/gnome/gok/id
-@dirrm share/gnome/gok/hu
-@dirrm share/gnome/gok/hr
-@dirrm share/gnome/gok/hi
-@dirrm share/gnome/gok/gu
-@dirrm share/gnome/gok/glade
-@dirrm share/gnome/gok/gl
-@dirrm share/gnome/gok/ga
-@dirrm share/gnome/gok/fr
-@dirrm share/gnome/gok/fi
-@dirrm share/gnome/gok/fa
-@dirrm share/gnome/gok/eu
-@dirrm share/gnome/gok/et
-@dirrm share/gnome/gok/es
-@dirrm share/gnome/gok/en_GB
-@dirrm share/gnome/gok/en_CA
-@dirrm share/gnome/gok/el
-@dirrm share/gnome/gok/dz
-@dirrm share/gnome/gok/de
-@dirrm share/gnome/gok/da
-@dirrm share/gnome/gok/cy
-@dirrm share/gnome/gok/cs
-@dirrm share/gnome/gok/ca
-@dirrm share/gnome/gok/bn_IN
-@dirrm share/gnome/gok/bn
-@dirrm share/gnome/gok/bg
-@dirrm share/gnome/gok/be
-@dirrm share/gnome/gok/az
-@dirrm share/gnome/gok/ar
-@dirrm share/gnome/gok/ang
-@dirrm share/gnome/gok/am
-@dirrm share/gnome/gok
 @dirrm %%DOCSDIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@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
@@ -936,3 +976,4 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
+@dirrmtry share/applications
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 5728db166316..50b8275fdedf 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,13 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/orca/Makefile,v 1.15 2007/03/13 00:05:30 marcus Exp $
+#   $MCom: ports/accessibility/orca/Makefile,v 1.32 2007/10/13 21:13:14 marcus Exp $
 #
 
 PORTNAME=	orca
-PORTVERSION=	2.18.1
-PORTREVISION=	1
-CATEGORIES=	accessibility x11 gnome
+PORTVERSION=	2.20.0.1
+CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
@@ -36,8 +35,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		orca.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-	    	s|/usr/X11R6|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/src/orca/orca.in
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    	${WRKSRC}/src/orca/orca_i18n.py
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index 31aa57e3d002..0af98af9df0e 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.18.1.tar.bz2) = 764f170af318c3ffd63b9cdfdcd19248
-SHA256 (gnome2/orca-2.18.1.tar.bz2) = 98ba4d3c8d6f306423f0806c573d8ad92f9fa24cccbefc34bb3bdc53125e5a31
-SIZE (gnome2/orca-2.18.1.tar.bz2) = 934098
+MD5 (gnome2/orca-2.20.0.1.tar.bz2) = dda6808aaf7815582ba84b648f3902a2
+SHA256 (gnome2/orca-2.20.0.1.tar.bz2) = d266203141fc7e3bcfa0f8daf1110d32cdb4d4791901593d08f127bd1a089ba3
+SIZE (gnome2/orca-2.20.0.1.tar.bz2) = 1401038
diff --git a/accessibility/orca/files/patch-src_orca_platform.py.in b/accessibility/orca/files/patch-src_orca_platform.py.in
deleted file mode 100644
index a21ae5f069bc..000000000000
--- a/accessibility/orca/files/patch-src_orca_platform.py.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/orca/platform.py.in.orig	Sun Mar 25 01:07:40 2007
-+++ src/orca/platform.py.in	Sun Mar 25 01:07:56 2007
-@@ -40,4 +40,4 @@ package     = "@PACKAGE@"
- 
- # The name of the data directory (usually "share").
- #
--datadirname = "@DATADIRNAME@"
-+datadirname = "@datadir@"
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index e438c1af429c..56202a965b54 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -11,9 +11,15 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/acss.py
 %%PYTHON_SITELIBDIR%%/orca/acss.pyc
 %%PYTHON_SITELIBDIR%%/orca/acss.pyo
+%%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.py
+%%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.pyc
+%%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.pyo
 %%PYTHON_SITELIBDIR%%/orca/atspi.py
 %%PYTHON_SITELIBDIR%%/orca/atspi.pyc
 %%PYTHON_SITELIBDIR%%/orca/atspi.pyo
+%%PYTHON_SITELIBDIR%%/orca/bookmarks.py
+%%PYTHON_SITELIBDIR%%/orca/bookmarks.pyc
+%%PYTHON_SITELIBDIR%%/orca/bookmarks.pyo
 %%PYTHON_SITELIBDIR%%/orca/braille.py
 %%PYTHON_SITELIBDIR%%/orca/braille.pyc
 %%PYTHON_SITELIBDIR%%/orca/braille.pyo
@@ -55,9 +61,6 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.py
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyc
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyo
-%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.py
-%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.pyc
-%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.pyo
 %%PYTHON_SITELIBDIR%%/orca/httpserver.py
 %%PYTHON_SITELIBDIR%%/orca/httpserver.pyc
 %%PYTHON_SITELIBDIR%%/orca/httpserver.pyo
@@ -160,12 +163,18 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyo
@@ -181,39 +190,43 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/metacity.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/planner.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.pyo
 %%PYTHON_SITELIBDIR%%/orca/settings.py
 %%PYTHON_SITELIBDIR%%/orca/settings.pyc
 %%PYTHON_SITELIBDIR%%/orca/settings.pyo
 %%PYTHON_SITELIBDIR%%/orca/speech.py
 %%PYTHON_SITELIBDIR%%/orca/speech.pyc
 %%PYTHON_SITELIBDIR%%/orca/speech.pyo
+%%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.py
+%%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.pyc
+%%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.pyo
 %%PYTHON_SITELIBDIR%%/orca/speechgenerator.py
 %%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyc
 %%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyo
 %%PYTHON_SITELIBDIR%%/orca/speechserver.py
 %%PYTHON_SITELIBDIR%%/orca/speechserver.pyc
 %%PYTHON_SITELIBDIR%%/orca/speechserver.pyo
-%%PYTHON_SITELIBDIR%%/orca/util.py
-%%PYTHON_SITELIBDIR%%/orca/util.pyc
-%%PYTHON_SITELIBDIR%%/orca/util.pyo
 %%PYTHON_SITELIBDIR%%/orca/where_am_I.py
 %%PYTHON_SITELIBDIR%%/orca/where_am_I.pyc
 %%PYTHON_SITELIBDIR%%/orca/where_am_I.pyo
-share/gnome/applications/orca.desktop
-share/gnome/orca/glade/orca-find.glade
-share/gnome/orca/glade/orca-mainwin.glade
-share/gnome/orca/glade/orca-quit.glade
-share/gnome/orca/glade/orca-setup.glade
+share/applications/orca.desktop
+share/icons/hicolor/16x16/apps/orca.png
+share/icons/hicolor/22x22/apps/orca.png
+share/icons/hicolor/24x24/apps/orca.png
+share/icons/hicolor/32x32/apps/orca.png
 share/icons/hicolor/48x48/apps/orca.png
+share/icons/hicolor/scalable/apps/orca.svg
 share/locale/ar/LC_MESSAGES/orca.mo
 share/locale/bg/LC_MESSAGES/orca.mo
 share/locale/bn/LC_MESSAGES/orca.mo
@@ -247,6 +260,7 @@ share/locale/mr/LC_MESSAGES/orca.mo
 share/locale/nb/LC_MESSAGES/orca.mo
 share/locale/ne/LC_MESSAGES/orca.mo
 share/locale/nl/LC_MESSAGES/orca.mo
+share/locale/oc/LC_MESSAGES/orca.mo
 share/locale/or/LC_MESSAGES/orca.mo
 share/locale/pa/LC_MESSAGES/orca.mo
 share/locale/pl/LC_MESSAGES/orca.mo
@@ -254,7 +268,9 @@ share/locale/pt/LC_MESSAGES/orca.mo
 share/locale/pt_BR/LC_MESSAGES/orca.mo
 share/locale/ru/LC_MESSAGES/orca.mo
 share/locale/rw/LC_MESSAGES/orca.mo
+share/locale/si/LC_MESSAGES/orca.mo
 share/locale/sl/LC_MESSAGES/orca.mo
+share/locale/sq/LC_MESSAGES/orca.mo
 share/locale/sr/LC_MESSAGES/orca.mo
 share/locale/sr@Latn/LC_MESSAGES/orca.mo
 share/locale/sv/LC_MESSAGES/orca.mo
@@ -266,17 +282,26 @@ share/locale/vi/LC_MESSAGES/orca.mo
 share/locale/zh_CN/LC_MESSAGES/orca.mo
 share/locale/zh_HK/LC_MESSAGES/orca.mo
 share/locale/zh_TW/LC_MESSAGES/orca.mo
-@dirrm share/gnome/orca/glade
-@dirrm share/gnome/orca
+%%DATADIR%%/glade/orca-find.glade
+%%DATADIR%%/glade/orca-mainwin.glade
+%%DATADIR%%/glade/orca-quit.glade
+%%DATADIR%%/glade/orca-setup.glade
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/orca
 @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/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/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/arabic/katoob/Makefile b/arabic/katoob/Makefile
index 3e7a1ff68d1a..724daa77c441 100644
--- a/arabic/katoob/Makefile
+++ b/arabic/katoob/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	katoob
 PORTVERSION=	0.3.5
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	arabic
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	arabeyes
diff --git a/arabic/katoob/pkg-plist b/arabic/katoob/pkg-plist
index 875bec3b7e43..be2536529022 100644
--- a/arabic/katoob/pkg-plist
+++ b/arabic/katoob/pkg-plist
@@ -1,16 +1,17 @@
 bin/katoob
-share/gnome/applications/katoob.desktop
-share/gnome/katoob/close.png
-share/gnome/katoob/emulator/arabic
-share/gnome/katoob/green.png
-share/gnome/katoob/katoob.png
-share/gnome/katoob/katoob-small.png
-share/gnome/katoob/landscape.png
-share/gnome/katoob/portrait.png
-share/gnome/katoob/red.png
-share/gnome/pixmaps/katoob-icon.png
+share/applications/katoob.desktop
+share/katoob/close.png
+share/katoob/emulator/arabic
+share/katoob/green.png
+share/katoob/katoob.png
+share/katoob/katoob-small.png
+share/katoob/landscape.png
+share/katoob/portrait.png
+share/katoob/red.png
+share/pixmaps/katoob-icon.png
 share/locale/ar/LC_MESSAGES/katoob.mo
 share/locale/pl/LC_MESSAGES/katoob.mo
 share/locale/sv/LC_MESSAGES/katoob.mo
-@dirrm share/gnome/katoob/emulator
-@dirrm share/gnome/katoob
+@dirrm share/katoob/emulator
+@dirrm share/katoob
+@dirrmtry share/applications
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 3386e4e63425..529b91c81a14 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/archivers/file-roller/Makefile,v 1.117 2007/03/12 23:23:57 marcus Exp $
+#   $MCom: ports/archivers/file-roller/Makefile,v 1.129 2007/10/15 21:06:05 mezz Exp $
 #
 
 PORTNAME=	file-roller
-PORTVERSION=	2.18.4
+PORTVERSION=	2.20.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 30be8c33b081..fa4dc60fd60b 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.18.4.tar.bz2) = f651f951d5c1c24288c1a25b1f567be0
-SHA256 (gnome2/file-roller-2.18.4.tar.bz2) = a977a20e1d41c68e12a7e37de855e7fcdd12b895554760e8dbf525d76b698f05
-SIZE (gnome2/file-roller-2.18.4.tar.bz2) = 1175112
+MD5 (gnome2/file-roller-2.20.1.tar.bz2) = d99d9cc2ae3007eb5c8a6c7eb7d861aa
+SHA256 (gnome2/file-roller-2.20.1.tar.bz2) = fb92243c93d1c1660a16250438ceddaf79032dc11d74e85807b6522847a9b887
+SIZE (gnome2/file-roller-2.20.1.tar.bz2) = 1223800
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 822212693f5a..11bea8942fd2 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -3,21 +3,25 @@ lib/nautilus/extensions-1.0/libnautilus-fileroller.a
 lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 lib/nautilus/extensions-1.0/libnautilus-fileroller.so
 libexec/file-roller/isoinfo.sh
-libexec/file-roller/move-here.sh
+share/applications/file-roller.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/file-roller.desktop
-share/gnome/file-roller/glade/ask-password.glade
-share/gnome/file-roller/glade/file-roller.glade
-share/gnome/file-roller/icons/hicolor/16x16/actions/add-files-to-archive.png
-share/gnome/file-roller/icons/hicolor/16x16/actions/add-folder-to-archive.png
-share/gnome/file-roller/icons/hicolor/16x16/actions/extract-archive.png
-share/gnome/file-roller/icons/hicolor/24x24/actions/add-files-to-archive.png
-share/gnome/file-roller/icons/hicolor/24x24/actions/add-folder-to-archive.png
-share/gnome/file-roller/icons/hicolor/24x24/actions/extract-archive.png
-share/gnome/file-roller/icons/hicolor/24x24/actions/preview-file.png
+%%DATADIR%%/glade/add-options.glade
+%%DATADIR%%/glade/batch-add-files.glade
+%%DATADIR%%/glade/batch-password.glade
+%%DATADIR%%/glade/delete.glade
+%%DATADIR%%/glade/open-with.glade
+%%DATADIR%%/glade/password.glade
+%%DATADIR%%/glade/properties.glade
+%%DATADIR%%/icons/hicolor/16x16/actions/add-files-to-archive.png
+%%DATADIR%%/icons/hicolor/16x16/actions/add-folder-to-archive.png
+%%DATADIR%%/icons/hicolor/16x16/actions/extract-archive.png
+%%DATADIR%%/icons/hicolor/24x24/actions/add-files-to-archive.png
+%%DATADIR%%/icons/hicolor/24x24/actions/add-folder-to-archive.png
+%%DATADIR%%/icons/hicolor/24x24/actions/extract-archive.png
+%%DATADIR%%/icons/hicolor/24x24/actions/preview-file.png
 share/gnome/help/file-roller/C/figures/file-roller_home.png
 share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/C/figures/file-roller_main_window.png
@@ -61,6 +65,12 @@ share/gnome/help/file-roller/nl/figures/file-roller_main_window.png
 share/gnome/help/file-roller/nl/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/nl/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/nl/file-roller.xml
+share/gnome/help/file-roller/oc/figures/file-roller_home.png
+share/gnome/help/file-roller/oc/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/oc/figures/file-roller_main_window.png
+share/gnome/help/file-roller/oc/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/oc/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/oc/file-roller.xml
 share/gnome/help/file-roller/ru/figures/file-roller_home.png
 share/gnome/help/file-roller/ru/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/ru/figures/file-roller_main_window.png
@@ -79,16 +89,6 @@ share/gnome/help/file-roller/uk/figures/file-roller_main_window.png
 share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/uk/file-roller.xml
-share/gnome/omf/file-roller/file-roller-C.omf
-share/gnome/omf/file-roller/file-roller-bg.omf
-share/gnome/omf/file-roller/file-roller-de.omf
-share/gnome/omf/file-roller/file-roller-es.omf
-share/gnome/omf/file-roller/file-roller-fr.omf
-share/gnome/omf/file-roller/file-roller-it.omf
-share/gnome/omf/file-roller/file-roller-nl.omf
-share/gnome/omf/file-roller/file-roller-ru.omf
-share/gnome/omf/file-roller/file-roller-sv.omf
-share/gnome/omf/file-roller/file-roller-uk.omf
 share/icons/hicolor/16x16/apps/file-roller.png
 share/icons/hicolor/22x22/apps/file-roller.png
 share/icons/hicolor/32x32/apps/file-roller.png
@@ -155,6 +155,7 @@ share/locale/pt_BR/LC_MESSAGES/file-roller.mo
 share/locale/ro/LC_MESSAGES/file-roller.mo
 share/locale/ru/LC_MESSAGES/file-roller.mo
 share/locale/rw/LC_MESSAGES/file-roller.mo
+share/locale/si/LC_MESSAGES/file-roller.mo
 share/locale/sk/LC_MESSAGES/file-roller.mo
 share/locale/sl/LC_MESSAGES/file-roller.mo
 share/locale/sq/LC_MESSAGES/file-roller.mo
@@ -173,13 +174,26 @@ share/locale/xh/LC_MESSAGES/file-roller.mo
 share/locale/zh_CN/LC_MESSAGES/file-roller.mo
 share/locale/zh_HK/LC_MESSAGES/file-roller.mo
 share/locale/zh_TW/LC_MESSAGES/file-roller.mo
-@dirrm share/gnome/omf/file-roller
+share/omf/file-roller/file-roller-C.omf
+share/omf/file-roller/file-roller-bg.omf
+share/omf/file-roller/file-roller-de.omf
+share/omf/file-roller/file-roller-es.omf
+share/omf/file-roller/file-roller-fr.omf
+share/omf/file-roller/file-roller-it.omf
+share/omf/file-roller/file-roller-nl.omf
+share/omf/file-roller/file-roller-oc.omf
+share/omf/file-roller/file-roller-ru.omf
+share/omf/file-roller/file-roller-sv.omf
+share/omf/file-roller/file-roller-uk.omf
+@dirrm share/omf/file-roller
 @dirrm share/gnome/help/file-roller/uk/figures
 @dirrm share/gnome/help/file-roller/uk
 @dirrm share/gnome/help/file-roller/sv/figures
 @dirrm share/gnome/help/file-roller/sv
 @dirrm share/gnome/help/file-roller/ru/figures
 @dirrm share/gnome/help/file-roller/ru
+@dirrm share/gnome/help/file-roller/oc/figures
+@dirrm share/gnome/help/file-roller/oc
 @dirrm share/gnome/help/file-roller/nl/figures
 @dirrm share/gnome/help/file-roller/nl
 @dirrm share/gnome/help/file-roller/it/figures
@@ -195,14 +209,14 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/help/file-roller/C/figures
 @dirrm share/gnome/help/file-roller/C
 @dirrm share/gnome/help/file-roller
-@dirrm share/gnome/file-roller/icons/hicolor/24x24/actions
-@dirrm share/gnome/file-roller/icons/hicolor/24x24
-@dirrm share/gnome/file-roller/icons/hicolor/16x16/actions
-@dirrm share/gnome/file-roller/icons/hicolor/16x16
-@dirrm share/gnome/file-roller/icons/hicolor
-@dirrm share/gnome/file-roller/icons
-@dirrm share/gnome/file-roller/glade
-@dirrm share/gnome/file-roller
+@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/file-roller
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -215,6 +229,8 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
+@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
@@ -233,3 +249,4 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index bf57066cbeb9..76eadbee10e0 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Vincent Tantardini <vinc@freebsd-fr.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/astro/glunarclock/Makefile,v 1.5 2007/05/19 21:35:54 marcus Exp $
 
 PORTNAME=	glunarclock
 PORTVERSION=	0.32.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,6 +20,7 @@ LIB_DEPENDS=	xklavier.11:${PORTSDIR}/x11/libxklavier
 USE_XLIB=	yes
 USE_GNOME=	gail gnomehack gnomepanel gnomeprefix gnometarget intlhack
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -30,8 +31,6 @@ PLIST_SUB=	VERSION="${PORTVERSION:R}"
 GCONF_SCHEMAS=	glunarclock.schemas
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|$${prefix}/share|$${datadir}|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-DGNOME_DISABLE_DEPRECATED||g'
 
diff --git a/astro/glunarclock/pkg-plist b/astro/glunarclock/pkg-plist
index c81b6a182c06..62be31a9ba7c 100644
--- a/astro/glunarclock/pkg-plist
+++ b/astro/glunarclock/pkg-plist
@@ -1,14 +1,14 @@
 libdata/bonobo/servers/GNOME_GLunarclockApplet_Factory.server
 libexec/glunarclock-applet-2
-share/gnome/glunarclock/glunarclock.glade
-share/gnome/gnome-2.0/ui/GNOME_GLunarclockApplet.xml
+share/glunarclock/glunarclock.glade
+share/gnome-2.0/ui/GNOME_GLunarclockApplet.xml
 share/gnome/help/glunarclock-applet-2/C/figures/glunarclock_applet.png
 share/gnome/help/glunarclock-applet-2/C/glunarclock-applet-2.xml
 share/gnome/help/glunarclock-applet-2/C/legal.xml
-share/gnome/omf/glunarclock/glunarclock-applet-2-C.omf
-share/gnome/pixmaps/glunarclock-logo.png
-share/gnome/pixmaps/glunarclock/cartoonmoon_12frames.png
-share/gnome/pixmaps/glunarclock/moon_56frames.png
+share/omf/glunarclock/glunarclock-applet-2-C.omf
+share/pixmaps/glunarclock-logo.png
+share/pixmaps/glunarclock/cartoonmoon_12frames.png
+share/pixmaps/glunarclock/moon_56frames.png
 share/locale/ast_ES/LC_MESSAGES/glunarclock-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/glunarclock-%%VERSION%%.mo
 share/locale/br/LC_MESSAGES/glunarclock-%%VERSION%%.mo
@@ -32,12 +32,12 @@ share/locale/sr/LC_MESSAGES/glunarclock-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/glunarclock-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/glunarclock-%%VERSION%%.mo
 share/locale/wa/LC_MESSAGES/glunarclock-%%VERSION%%.mo
-@dirrm share/gnome/pixmaps/glunarclock
-@dirrm share/gnome/omf/glunarclock
+@dirrm share/pixmaps/glunarclock
+@dirrm share/omf/glunarclock
 @dirrm share/gnome/help/glunarclock-applet-2/C/figures
 @dirrm share/gnome/help/glunarclock-applet-2/C
 @dirrm share/gnome/help/glunarclock-applet-2
-@dirrm share/gnome/glunarclock
+@dirrm share/glunarclock
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/ast_ES/LC_MESSAGES
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index 9ea50341905b..306dcb1ec32a 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nightfall
 PORTVERSION=	1.62
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://www.la-samhna.de/nightfall/ CENKES
 
@@ -33,9 +34,7 @@ MAN1=		nightfall.1
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 PKGNAMESUFFIX=	-gnome
 USE_GNOME+=	gnomeprefix libgnomeui
-CONFIGURE_ARGS+=	--with-gnomedoc-prefix=${PREFIX}/share
 INSTALLS_OMF=	yes
-DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 .else
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
@@ -69,12 +68,12 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS -O3|CFLAGS|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|^Icon=gnome|Icon=${DATADIR}/pixmaps/gnome|g' \
+	@${REINPLACE_CMD} -e 's|^Icon=gnome|Icon=${DATADIR}/pixmaps|g' \
 		${WRKSRC}/nightfall.desktop
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/gnome/applications
+	@${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/nightfall.desktop \
-		${PREFIX}/share/gnome/applications
+		${PREFIX}/share/applications
 
 .include <bsd.port.post.mk>
diff --git a/astro/nightfall/pkg-plist b/astro/nightfall/pkg-plist
index ffb6132c1807..1ede1c4a19e6 100644
--- a/astro/nightfall/pkg-plist
+++ b/astro/nightfall/pkg-plist
@@ -1,5 +1,5 @@
 bin/nightfall
-share/gnome/applications/nightfall.desktop
+share/applications/nightfall.desktop
 %%GNOME:%%share/gnome/help/nightfall/C/nightfall.xml
 %%GNOME:%%share/gnome/help/nightfall/de/nightfall.xml
 share/locale/de/LC_MESSAGES/nightfall.mo
@@ -83,9 +83,9 @@ share/locale/it/LC_MESSAGES/nightfall.mo
 %%DATADIR%%/pixmaps/starp_256.jpg
 %%DATADIR%%/pixmaps/stars_128.jpg
 %%DATADIR%%/pixmaps/stars_256.jpg
-%%GNOME:%%share/gnome/omf/nightfall/nightfall-C.omf
-%%GNOME:%%share/gnome/omf/nightfall/nightfall-de.omf
-%%GNOME:%%@dirrm share/gnome/omf/nightfall
+%%GNOME:%%share/omf/nightfall/nightfall-C.omf
+%%GNOME:%%share/omf/nightfall/nightfall-de.omf
+%%GNOME:%%@dirrm share/omf/nightfall
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/doc/de
 @dirrm %%DATADIR%%/doc/C
@@ -96,3 +96,4 @@ share/locale/it/LC_MESSAGES/nightfall.mo
 %%GNOME:%%@dirrm share/gnome/help/nightfall/de
 %%GNOME:%%@dirrm share/gnome/help/nightfall/C
 %%GNOME:%%@dirrm share/gnome/help/nightfall
+@dirrmtry share/applications
diff --git a/audio/Makefile b/audio/Makefile
index 7886ff8d387a..8c03a79e4c05 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -223,6 +223,7 @@
     SUBDIR += gnustep-cdplayer
     SUBDIR += gogo
     SUBDIR += gogo-petit
+    SUBDIR += goobox
     SUBDIR += gqmpeg
     SUBDIR += gqmpeg-devel
     SUBDIR += gqradio
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 4d4e42c8b718..c5352c62dff9 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	beast
 PORTVERSION=	0.6.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	ftp://beast.gtk.org/pub/beast/v0.6/ \
 		http://beast.gtk.org/beast-ftp/v0.6/
diff --git a/audio/beast/pkg-plist b/audio/beast/pkg-plist
index ebb1401bf559..40c58df9de62 100644
--- a/audio/beast/pkg-plist
+++ b/audio/beast/pkg-plist
@@ -200,62 +200,62 @@ lib/libsfi.la
 lib/libsfi.so
 libdata/pkgconfig/bse.pc
 libdata/pkgconfig/sfi.pc
-share/gnome/application-registry/beast.applications
-share/gnome/applications/beast.desktop
-share/gnome/beast/v0.6.6/docs/architecture.markup
-share/gnome/beast/v0.6.6/docs/beast-gxk.3.markup
-share/gnome/beast/v0.6.6/docs/beast-index.markup
-share/gnome/beast/v0.6.6/docs/beast.1.markup
-share/gnome/beast/v0.6.6/docs/bse-procs.3.markup
-share/gnome/beast/v0.6.6/docs/bse-structs.3.markup
-share/gnome/beast/v0.6.6/docs/bse.3.markup
-share/gnome/beast/v0.6.6/docs/bsesh.1.markup
-share/gnome/beast/v0.6.6/docs/engine-mplan.markup
-share/gnome/beast/v0.6.6/docs/faq.markup
-share/gnome/beast/v0.6.6/docs/objdoc.markup
-share/gnome/beast/v0.6.6/docs/plugin-devel.markup
-share/gnome/beast/v0.6.6/docs/quickstart.markup
-share/gnome/beast/v0.6.6/docs/release-news.markup
-share/gnome/beast/v0.6.6/docs/release-notes.markup
-share/gnome/beast/v0.6.6/docs/sfi.3.markup
-share/gnome/beast/v0.6.6/docs/sfidl-manual.markup
-share/gnome/beast/v0.6.6/docs/sfidl.1.markup
-share/gnome/beast/v0.6.6/images/beast-components.png
-share/gnome/beast/v0.6.6/images/beast-mime.png
-share/gnome/beast/v0.6.6/images/beast-progs.png
-share/gnome/beast/v0.6.6/images/beast-splash.png
-share/gnome/beast/v0.6.6/images/bse-mime.png
-share/gnome/beast/v0.6.6/images/module-voices.png
-share/gnome/beast/v0.6.6/keys/keyrc.de
-share/gnome/beast/v0.6.6/keys/keyrc.us
-share/gnome/beast/v0.6.6/skins/biogreen.skin
-share/gnome/beast/v0.6.6/skins/blueimpress.skin
-share/gnome/beast/v0.6.6/skins/brownforms.skin
-share/gnome/beast/v0.6.6/skins/images/biogreen.jpg
-share/gnome/beast/v0.6.6/skins/images/blueimpress.jpg
-share/gnome/beast/v0.6.6/skins/images/brownforms.jpg
-share/gnome/beast/v0.6.6/skins/images/moonpaper.png
-share/gnome/beast/v0.6.6/skins/images/silvervein.png
-share/gnome/beast/v0.6.6/skins/moonpaper.skin
-share/gnome/beast/v0.6.6/skins/silvervein.skin
-share/gnome/beast/v0.6.6/skins/white.skin
-share/gnome/bse/v0.6.6/demo/partymonster.bse
-share/gnome/bse/v0.6.6/demo/stereo-through.bse
-share/gnome/bse/v0.6.6/demo/x2-midi-test.bse
-share/gnome/bse/v0.6.6/effects/atan-canyon.bse
-share/gnome/bse/v0.6.6/instruments/synth-lead.bse
-share/gnome/bse/v0.6.6/instruments/test-string.bse
-share/gnome/bse/v0.6.6/scripts/bse-scm-glue.boot
-share/gnome/bse/v0.6.6/scripts/mixer-splitup-by-track.scm
-share/gnome/bse/v0.6.6/scripts/modules2grid.scm
-share/gnome/bse/v0.6.6/scripts/part-harmonic-transposer.scm
-share/gnome/bse/v0.6.6/scripts/progressor-example.scm
-share/gnome/bse/v0.6.6/scripts/record-midi.scm
-share/gnome/bse/v0.6.6/scripts/song-parts-operations.scm
-share/gnome/mime-info/bse.keys
-share/gnome/mime-info/bse.mime
-share/gnome/pixmaps/beast-audio-x-bse.png
-share/gnome/pixmaps/beast.png
+share/application-registry/beast.applications
+share/applications/beast.desktop
+share/beast/v0.6.6/docs/architecture.markup
+share/beast/v0.6.6/docs/beast-gxk.3.markup
+share/beast/v0.6.6/docs/beast-index.markup
+share/beast/v0.6.6/docs/beast.1.markup
+share/beast/v0.6.6/docs/bse-procs.3.markup
+share/beast/v0.6.6/docs/bse-structs.3.markup
+share/beast/v0.6.6/docs/bse.3.markup
+share/beast/v0.6.6/docs/bsesh.1.markup
+share/beast/v0.6.6/docs/engine-mplan.markup
+share/beast/v0.6.6/docs/faq.markup
+share/beast/v0.6.6/docs/objdoc.markup
+share/beast/v0.6.6/docs/plugin-devel.markup
+share/beast/v0.6.6/docs/quickstart.markup
+share/beast/v0.6.6/docs/release-news.markup
+share/beast/v0.6.6/docs/release-notes.markup
+share/beast/v0.6.6/docs/sfi.3.markup
+share/beast/v0.6.6/docs/sfidl-manual.markup
+share/beast/v0.6.6/docs/sfidl.1.markup
+share/beast/v0.6.6/images/beast-components.png
+share/beast/v0.6.6/images/beast-mime.png
+share/beast/v0.6.6/images/beast-progs.png
+share/beast/v0.6.6/images/beast-splash.png
+share/beast/v0.6.6/images/bse-mime.png
+share/beast/v0.6.6/images/module-voices.png
+share/beast/v0.6.6/keys/keyrc.de
+share/beast/v0.6.6/keys/keyrc.us
+share/beast/v0.6.6/skins/biogreen.skin
+share/beast/v0.6.6/skins/blueimpress.skin
+share/beast/v0.6.6/skins/brownforms.skin
+share/beast/v0.6.6/skins/images/biogreen.jpg
+share/beast/v0.6.6/skins/images/blueimpress.jpg
+share/beast/v0.6.6/skins/images/brownforms.jpg
+share/beast/v0.6.6/skins/images/moonpaper.png
+share/beast/v0.6.6/skins/images/silvervein.png
+share/beast/v0.6.6/skins/moonpaper.skin
+share/beast/v0.6.6/skins/silvervein.skin
+share/beast/v0.6.6/skins/white.skin
+share/bse/v0.6.6/demo/partymonster.bse
+share/bse/v0.6.6/demo/stereo-through.bse
+share/bse/v0.6.6/demo/x2-midi-test.bse
+share/bse/v0.6.6/effects/atan-canyon.bse
+share/bse/v0.6.6/instruments/synth-lead.bse
+share/bse/v0.6.6/instruments/test-string.bse
+share/bse/v0.6.6/scripts/bse-scm-glue.boot
+share/bse/v0.6.6/scripts/mixer-splitup-by-track.scm
+share/bse/v0.6.6/scripts/modules2grid.scm
+share/bse/v0.6.6/scripts/part-harmonic-transposer.scm
+share/bse/v0.6.6/scripts/progressor-example.scm
+share/bse/v0.6.6/scripts/record-midi.scm
+share/bse/v0.6.6/scripts/song-parts-operations.scm
+share/mime-info/bse.keys
+share/mime-info/bse.mime
+share/pixmaps/beast-audio-x-bse.png
+share/pixmaps/beast.png
 share/locale/az/LC_MESSAGES/beast-v0.6.6.mo
 share/locale/bg/LC_MESSAGES/beast-v0.6.6.mo
 share/locale/ca/LC_MESSAGES/beast-v0.6.6.mo
@@ -290,20 +290,21 @@ share/mime/packages/beast.xml
 @dirrm lib/bse/v0.6.6/plugins
 @dirrm lib/bse/v0.6.6
 @dirrm lib/bse
-@dirrm share/gnome/beast/v0.6.6/docs
-@dirrm share/gnome/beast/v0.6.6/images
-@dirrm share/gnome/beast/v0.6.6/keys
-@dirrm share/gnome/beast/v0.6.6/skins/images
-@dirrm share/gnome/beast/v0.6.6/skins
-@dirrm share/gnome/beast/v0.6.6
-@dirrm share/gnome/beast
-@dirrm share/gnome/bse/v0.6.6/demo
-@dirrm share/gnome/bse/v0.6.6/effects
-@dirrm share/gnome/bse/v0.6.6/instruments
-@dirrm share/gnome/bse/v0.6.6/scripts
-@dirrm share/gnome/bse/v0.6.6
-@dirrm share/gnome/bse
+@dirrm share/beast/v0.6.6/docs
+@dirrm share/beast/v0.6.6/images
+@dirrm share/beast/v0.6.6/keys
+@dirrm share/beast/v0.6.6/skins/images
+@dirrm share/beast/v0.6.6/skins
+@dirrm share/beast/v0.6.6
+@dirrm share/beast
+@dirrm share/bse/v0.6.6/demo
+@dirrm share/bse/v0.6.6/effects
+@dirrm share/bse/v0.6.6/instruments
+@dirrm share/bse/v0.6.6/scripts
+@dirrm share/bse/v0.6.6
+@dirrm share/bse
 @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/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index 431f42d2f49b..585c192074ce 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cantus
 PORTVERSION=	3.0.2
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-testing.src
 CATEGORIES=	audio
 MASTER_SITES=	SF
diff --git a/audio/cantus_3/pkg-plist b/audio/cantus_3/pkg-plist
index e7a67d16df7d..9ec628f8e585 100644
--- a/audio/cantus_3/pkg-plist
+++ b/audio/cantus_3/pkg-plist
@@ -17,20 +17,20 @@ lib/libcantusplugin_tag2filename.so.3
 lib/libcantusplugin_vorbis.la
 lib/libcantusplugin_vorbis.so
 lib/libcantusplugin_vorbis.so.3
-share/gnome/cantus/glade/cantus.glade
-share/gnome/cantus/glade/cantus.gladep
-share/gnome/cantus/glade/strings.c
-share/gnome/pixmaps/cantus/general/general.png
-share/gnome/pixmaps/cantus/logo/cantus.svg
-share/gnome/pixmaps/cantus/logo/cantus_tag.png
+share/cantus/glade/cantus.glade
+share/cantus/glade/cantus.gladep
+share/cantus/glade/strings.c
+share/pixmaps/cantus/general/general.png
+share/pixmaps/cantus/logo/cantus.svg
+share/pixmaps/cantus/logo/cantus_tag.png
 share/locale/de/LC_MESSAGES/cantus.mo
 share/locale/es/LC_MESSAGES/cantus.mo
 share/locale/fr/LC_MESSAGES/cantus.mo
 share/locale/it/LC_MESSAGES/cantus.mo
 share/locale/nl/LC_MESSAGES/cantus.mo
 share/locale/pl/LC_MESSAGES/cantus.mo
-@dirrm share/gnome/cantus/glade
-@dirrm share/gnome/cantus
-@dirrm share/gnome/pixmaps/cantus/general
-@dirrm share/gnome/pixmaps/cantus/logo
-@dirrm share/gnome/pixmaps/cantus
+@dirrm share/cantus/glade
+@dirrm share/cantus
+@dirrm share/pixmaps/cantus/general
+@dirrm share/pixmaps/cantus/logo
+@dirrm share/pixmaps/cantus
diff --git a/audio/cowbell/Makefile b/audio/cowbell/Makefile
index 69d640655896..e0798c0b391b 100644
--- a/audio/cowbell/Makefile
+++ b/audio/cowbell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cowbell
 PORTVERSION=	0.2.7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://more-cowbell.org/releases/
 
diff --git a/audio/cowbell/pkg-plist b/audio/cowbell/pkg-plist
index a713ed30d6b1..4b3db0f7dab8 100644
--- a/audio/cowbell/pkg-plist
+++ b/audio/cowbell/pkg-plist
@@ -4,7 +4,7 @@ lib/cowbell/cowbell.exe.config
 lib/cowbell/libtaglibsharpglue.a
 lib/cowbell/libtaglibsharpglue.la
 lib/cowbell/libtaglibsharpglue.so
-share/gnome/applications/cowbell.desktop
+share/applications/cowbell.desktop
 share/icons/hicolor/48x48/apps/cowbell.png
 share/icons/hicolor/scalable/apps/cowbell.svg
 share/locale/de/LC_MESSAGES/cowbell.mo
@@ -20,3 +20,4 @@ share/locale/pt_BR/LC_MESSAGES/cowbell.mo
 share/locale/sv/LC_MESSAGES/cowbell.mo
 share/locale/tr/LC_MESSAGES/cowbell.mo
 @dirrm lib/cowbell
+@dirrmtry share/applications
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index acfc251fa2bf..f98de06e7e38 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/easytag-devel/pkg-plist b/audio/easytag-devel/pkg-plist
index b3051cfc6410..d9eb0006c710 100644
--- a/audio/easytag-devel/pkg-plist
+++ b/audio/easytag-devel/pkg-plist
@@ -1,8 +1,8 @@
 bin/easytag
-share/gnome/applications/easytag.desktop
-share/gnome/easytag/ChangeLog
-share/gnome/easytag/EasyTAG_logo.xpm
-share/gnome/pixmaps/EasyTAG.xpm
+share/applications/easytag.desktop
+share/easytag/ChangeLog
+share/easytag/EasyTAG_logo.xpm
+share/pixmaps/EasyTAG.xpm
 share/locale/bg/LC_MESSAGES/easytag.mo
 share/locale/cs/LC_MESSAGES/easytag.mo
 share/locale/da/LC_MESSAGES/easytag.mo
@@ -22,6 +22,7 @@ share/locale/ru/LC_MESSAGES/easytag.mo
 share/locale/sv/LC_MESSAGES/easytag.mo
 share/locale/uk/LC_MESSAGES/easytag.mo
 share/locale/zh_CN/LC_MESSAGES/easytag.mo
-@dirrm share/gnome/easytag
+@dirrm share/easytag
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/applications
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 2c26f8c99d03..b4377f93d445 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/easytag/pkg-plist b/audio/easytag/pkg-plist
index f88c834c5a2a..c71718604e2d 100644
--- a/audio/easytag/pkg-plist
+++ b/audio/easytag/pkg-plist
@@ -1,8 +1,8 @@
 bin/easytag
-share/gnome/applications/easytag.desktop
-share/gnome/easytag/ChangeLog
-share/gnome/easytag/EasyTAG_logo.xpm
-share/gnome/pixmaps/EasyTAG.xpm
+share/applications/easytag.desktop
+share/easytag/ChangeLog
+share/easytag/EasyTAG_logo.xpm
+share/pixmaps/EasyTAG.xpm
 share/locale/bg/LC_MESSAGES/easytag.mo
 share/locale/cs/LC_MESSAGES/easytag.mo
 share/locale/da/LC_MESSAGES/easytag.mo
@@ -21,6 +21,7 @@ share/locale/ru/LC_MESSAGES/easytag.mo
 share/locale/sv/LC_MESSAGES/easytag.mo
 share/locale/uk/LC_MESSAGES/easytag.mo
 share/locale/zh_CN/LC_MESSAGES/easytag.mo
-@dirrm share/gnome/easytag
+@dirrm share/easytag
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/applications
diff --git a/audio/gai-album/Makefile b/audio/gai-album/Makefile
index 27a9dd5c05c9..33852b503222 100644
--- a/audio/gai-album/Makefile
+++ b/audio/gai-album/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gai-album
 PORTVERSION=	0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gai
@@ -26,14 +26,12 @@ USE_GNOME=	gnomehack gnomeprefix
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|\(GNOMEDIR=\).*|\1"${PREFIX}"|; \
-		 s|share\(/pixmaps\)|share/gnome\1|; \
 		 s|:GNOME_|:GAI-|g; \
 		 s|\(@APPLET_NAME@\)\(Applet\)|\1-\2|g; \
 		 s|\(Applet\)_\(Factory\)|\1-\2|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|lib\(/bonobo\)|libdata\1|; \
-		 s|share\(/pixmaps\)|share/gnome\1|; \
 		 s|-O3||' \
 		${WRKSRC}/Makefile.in
 
diff --git a/audio/gai-album/pkg-plist b/audio/gai-album/pkg-plist
index d196bcb2ec48..673b89441c5d 100644
--- a/audio/gai-album/pkg-plist
+++ b/audio/gai-album/pkg-plist
@@ -1,6 +1,6 @@
 bin/gai-album
 libdata/bonobo/servers/GNOME_gai-albumApplet.server
-share/gnome/pixmaps/gai-album-icon.png
-share/gnome/pixmaps/gai-album/naif.png
-share/gnome/pixmaps/gai-album/no_xmms.png
-@dirrm share/gnome/pixmaps/gai-album
+share/pixmaps/gai-album-icon.png
+share/pixmaps/gai-album/naif.png
+share/pixmaps/gai-album/no_xmms.png
+@dirrm share/pixmaps/gai-album
diff --git a/audio/gai-visual-audio/Makefile b/audio/gai-visual-audio/Makefile
index 869d994585dc..76234133bf6f 100644
--- a/audio/gai-visual-audio/Makefile
+++ b/audio/gai-visual-audio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gai-visual-audio
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gai
@@ -33,7 +33,6 @@ post-patch:
 		${WRKSRC}/GNOME_DefaultApplet.server.in
 	@${REINPLACE_CMD} -e \
 		's|lib\(/bonobo\)|libdata\1|; \
-		 s|share\(/pixmaps\)|share/gnome\1|; \
 		 s|-O3||' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/plugin/Makefile
diff --git a/audio/gai-visual-audio/pkg-plist b/audio/gai-visual-audio/pkg-plist
index d0a51e6a551d..dff446dc42d4 100644
--- a/audio/gai-visual-audio/pkg-plist
+++ b/audio/gai-visual-audio/pkg-plist
@@ -1,7 +1,7 @@
 bin/gai-va
 libdata/bonobo/servers/GNOME_gai-vaApplet.server
-share/gnome/pixmaps/gai-va-icon.png
-share/gnome/pixmaps/gai-va/va.png
-@dirrm share/gnome/pixmaps/gai-va
+share/pixmaps/gai-va-icon.png
+share/pixmaps/gai-va/va.png
+@dirrm share/pixmaps/gai-va
 @cwd %%X11BASE%%
 lib/xmms/Visualization/spec_plugin.so
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index c7d2d824a230..b7c55562cb40 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glame
 PORTVERSION=	2.0.1
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/glame/pkg-plist b/audio/glame/pkg-plist
index 791927ad0125..1117b76a891d 100644
--- a/audio/glame/pkg-plist
+++ b/audio/glame/pkg-plist
@@ -29,60 +29,60 @@ lib/glame/tutorial.a
 lib/glame/tutorial.la
 lib/glame/tutorial.so
 share/gnome/apps/Multimedia/glame.desktop
-share/gnome/glame/default-accels
-share/gnome/glame/pixmaps/bandpass.png
-share/gnome/glame/pixmaps/const.png
-share/gnome/glame/pixmaps/default.png
-share/gnome/glame/pixmaps/delay.png
-share/gnome/glame/pixmaps/distortion.png
-share/gnome/glame/pixmaps/dots.png
-share/gnome/glame/pixmaps/drop.png
-share/gnome/glame/pixmaps/dup.png
-share/gnome/glame/pixmaps/echo.png
-share/gnome/glame/pixmaps/equalizer.png
-share/gnome/glame/pixmaps/extend.png
-share/gnome/glame/pixmaps/fade.png
-share/gnome/glame/pixmaps/fft.png
-share/gnome/glame/pixmaps/flanger.png
-share/gnome/glame/pixmaps/glame-logo.jpg
-share/gnome/glame/pixmaps/iir.png
-share/gnome/glame/pixmaps/input.png
-share/gnome/glame/pixmaps/invert.png
-share/gnome/glame/pixmaps/mix1.png
-share/gnome/glame/pixmaps/noisegate.png
-share/gnome/glame/pixmaps/null.png
-share/gnome/glame/pixmaps/one2n.png
-share/gnome/glame/pixmaps/output.png
-share/gnome/glame/pixmaps/pan.png
-share/gnome/glame/pixmaps/ping.png
-share/gnome/glame/pixmaps/pipe.png
-share/gnome/glame/pixmaps/play-button.png
-share/gnome/glame/pixmaps/play.png
-share/gnome/glame/pixmaps/prod.png
-share/gnome/glame/pixmaps/pulse.png
-share/gnome/glame/pixmaps/rect.png
-share/gnome/glame/pixmaps/repeat.png
-share/gnome/glame/pixmaps/resample.png
-share/gnome/glame/pixmaps/save.png
-share/gnome/glame/pixmaps/select_all.png
-share/gnome/glame/pixmaps/select_none.png
-share/gnome/glame/pixmaps/sine.png
-share/gnome/glame/pixmaps/statistics.png
-share/gnome/glame/pixmaps/stop-button.png
-share/gnome/glame/pixmaps/sum.png
-share/gnome/glame/pixmaps/volume_adjust.png
-share/gnome/glame/pixmaps/zoom_in.png
-share/gnome/glame/pixmaps/zoom_out.png
-share/gnome/glame/scripts/bassboost.scm
-share/gnome/glame/scripts/echo2.scm
-share/gnome/glame/scripts/glame.scm
-share/gnome/glame/scripts/glame_testsuite.scm
-share/gnome/glame/scripts/read_mp3.scm
-share/gnome/glame/scripts/resample.scm
-share/gnome/glame/scripts/write_mp3.scm
+share/glame/default-accels
+share/glame/pixmaps/bandpass.png
+share/glame/pixmaps/const.png
+share/glame/pixmaps/default.png
+share/glame/pixmaps/delay.png
+share/glame/pixmaps/distortion.png
+share/glame/pixmaps/dots.png
+share/glame/pixmaps/drop.png
+share/glame/pixmaps/dup.png
+share/glame/pixmaps/echo.png
+share/glame/pixmaps/equalizer.png
+share/glame/pixmaps/extend.png
+share/glame/pixmaps/fade.png
+share/glame/pixmaps/fft.png
+share/glame/pixmaps/flanger.png
+share/glame/pixmaps/glame-logo.jpg
+share/glame/pixmaps/iir.png
+share/glame/pixmaps/input.png
+share/glame/pixmaps/invert.png
+share/glame/pixmaps/mix1.png
+share/glame/pixmaps/noisegate.png
+share/glame/pixmaps/null.png
+share/glame/pixmaps/one2n.png
+share/glame/pixmaps/output.png
+share/glame/pixmaps/pan.png
+share/glame/pixmaps/ping.png
+share/glame/pixmaps/pipe.png
+share/glame/pixmaps/play-button.png
+share/glame/pixmaps/play.png
+share/glame/pixmaps/prod.png
+share/glame/pixmaps/pulse.png
+share/glame/pixmaps/rect.png
+share/glame/pixmaps/repeat.png
+share/glame/pixmaps/resample.png
+share/glame/pixmaps/save.png
+share/glame/pixmaps/select_all.png
+share/glame/pixmaps/select_none.png
+share/glame/pixmaps/sine.png
+share/glame/pixmaps/statistics.png
+share/glame/pixmaps/stop-button.png
+share/glame/pixmaps/sum.png
+share/glame/pixmaps/volume_adjust.png
+share/glame/pixmaps/zoom_in.png
+share/glame/pixmaps/zoom_out.png
+share/glame/scripts/bassboost.scm
+share/glame/scripts/echo2.scm
+share/glame/scripts/glame.scm
+share/glame/scripts/glame_testsuite.scm
+share/glame/scripts/read_mp3.scm
+share/glame/scripts/resample.scm
+share/glame/scripts/write_mp3.scm
 share/locale/de/LC_MESSAGES/glame.mo
 share/locale/fr/LC_MESSAGES/glame.mo
-@dirrm share/gnome/glame/scripts
-@dirrm share/gnome/glame/pixmaps
-@dirrm share/gnome/glame
+@dirrm share/glame/scripts
+@dirrm share/glame/pixmaps
+@dirrm share/glame
 @dirrm lib/glame
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index d33274ad7f9b..1d96d30c33aa 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-audio/Makefile,v 1.3 2006/07/22 19:49:20 mezz Exp $
+#   $MCom: ports/audio/gnome-audio/Makefile,v 1.6 2007/06/29 22:55:02 mezz Exp $
 #
 
 PORTNAME=	gnome-audio
 PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-audio/2.0
@@ -21,5 +21,6 @@ USE_XLIB=	yes
 NO_BUILD=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier
 WRKSRC=		${WRKDIR}/${DISTNAME}/sounds
+MAKE_ENV=	prefix=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/audio/gnome-audio/files/patch-Makefile b/audio/gnome-audio/files/patch-Makefile
index f5556e24f16d..962c506807b6 100644
--- a/audio/gnome-audio/files/patch-Makefile
+++ b/audio/gnome-audio/files/patch-Makefile
@@ -4,16 +4,3 @@
 -prefix=$(shell gnome-config --prefix)
 -
  LN_S=ln -sf
-@@ -14,4 +12,4 @@
- 	for I in *.wav */*.wav ; do \
--		$(MKINSTALLDIRS) $(prefix)/share/sounds/`dirname $$I`; \
--		$(INSTALL_DATA) $$I $(prefix)/share/sounds/$$I; \
-+		$(MKINSTALLDIRS) $(PREFIX)/share/gnome/sounds/`dirname $$I`; \
-+		$(INSTALL_DATA) $$I $(PREFIX)/share/gnome/sounds/$$I; \
- 	done
-@@ -19,3 +17,3 @@
- install-default-links:
--	$(LN_S) startup3.wav $(prefix)/share/sounds/login.wav
--	$(LN_S) shutdown1.wav $(prefix)/share/sounds/logout.wav
-+	$(LN_S) startup3.wav $(PREFIX)/share/gnome/sounds/login.wav
-+	$(LN_S) shutdown1.wav $(PREFIX)/share/gnome/sounds/logout.wav
diff --git a/audio/gnome-audio/pkg-plist b/audio/gnome-audio/pkg-plist
index 93609a8dc24a..4dd0d274bf9c 100644
--- a/audio/gnome-audio/pkg-plist
+++ b/audio/gnome-audio/pkg-plist
@@ -1,18 +1,18 @@
-share/gnome/sounds/card_shuffle.wav
-share/gnome/sounds/email.wav
-share/gnome/sounds/error.wav
-share/gnome/sounds/generic.wav
-share/gnome/sounds/gtk-events/activate.wav
-share/gnome/sounds/gtk-events/clicked.wav
-share/gnome/sounds/gtk-events/toggled.wav
-share/gnome/sounds/info.wav
-share/gnome/sounds/login.wav
-share/gnome/sounds/logout.wav
-share/gnome/sounds/panel/slide.wav
-share/gnome/sounds/phone.wav
-share/gnome/sounds/question.wav
-share/gnome/sounds/shutdown1.wav
-share/gnome/sounds/startup3.wav
-share/gnome/sounds/warning.wav
-@dirrm share/gnome/sounds/gtk-events
-@dirrm share/gnome/sounds/panel
+share/sounds/card_shuffle.wav
+share/sounds/email.wav
+share/sounds/error.wav
+share/sounds/generic.wav
+share/sounds/gtk-events/activate.wav
+share/sounds/gtk-events/clicked.wav
+share/sounds/gtk-events/toggled.wav
+share/sounds/info.wav
+share/sounds/login.wav
+share/sounds/logout.wav
+share/sounds/panel/slide.wav
+share/sounds/phone.wav
+share/sounds/question.wav
+share/sounds/shutdown1.wav
+share/sounds/startup3.wav
+share/sounds/warning.wav
+@dirrm share/sounds/gtk-events
+@dirrm share/sounds/panel
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 614fc9c762e6..b1f9e4228684 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.105 2007/03/12 12:00:20 ahze Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.112 2007/09/19 12:22:57 ahze Exp $
 #
 
 PORTNAME=	gnome-media
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +18,7 @@ COMMENT=	Multimedia applications for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -35,13 +34,10 @@ GCONF_SCHEMAS=	CDDB-Slave2.schemas gnome-audio-profiles.schemas \
 		gnome-cd.schemas gnome-sound-recorder.schemas \
 		gnome-volume-control.schemas
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
 		${WRKSRC}/gnome-cd/Makefile.in
-.if ${OSVERSION} > 501107
-	@${REINPLACE_CMD} -e 's|acd0c|acd0|' ${WRKSRC}/configure
-.endif
+	@${REINPLACE_CMD} -e 's|acd0c|acd0|g ; s|== "xyes|= "xyes|g' \
+		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index cd941224e7b6..750f2904ad5e 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.18.0.tar.bz2) = a472d8c7733b119376bc6127ee55a82d
-SHA256 (gnome2/gnome-media-2.18.0.tar.bz2) = 9d52a03f98c5ad9230ac2bcf1cb65644786c71a1ded2f47f7c46a79ad7d769e3
-SIZE (gnome2/gnome-media-2.18.0.tar.bz2) = 3007639
+MD5 (gnome2/gnome-media-2.20.1.tar.bz2) = 75036a6990725c4323812afd4cd734f5
+SHA256 (gnome2/gnome-media-2.20.1.tar.bz2) = 273b9eb4bc5a0cd7f1589f4eb242b995b05d64db20c05ec379d07af3b90d9c29
+SIZE (gnome2/gnome-media-2.20.1.tar.bz2) = 1927211
diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure
deleted file mode 100644
index c907f2fa56e7..000000000000
--- a/audio/gnome-media/files/patch-configure
+++ /dev/null
@@ -1,74 +0,0 @@
---- configure.orig	Mon Feb 12 16:07:48 2007
-+++ configure	Mon Feb 12 16:08:23 2007
-@@ -5808,7 +5808,7 @@ if test "${enable_cddbslave+set}" = set;
- else
-   enable_cddbslave=yes
- fi;
--if test "x$enable_cddbslave" == "xyes"; then
-+if test "x$enable_cddbslave" = "xyes"; then
- 
- pkg_failed=no
- echo "$as_me:$LINENO: checking for CDDBSLAVE" >&5
-@@ -6750,7 +6750,7 @@ if test "${enable_profiles+set}" = set; 
- else
-   enable_profiles=yes
- fi;
--if test "x$enable_profiles" == "xyes"; then
-+if test "x$enable_profiles" = "xyes"; then
- 
- pkg_failed=no
- echo "$as_me:$LINENO: checking for GMP" >&5
-@@ -6967,7 +6967,7 @@ echo "$as_me: WARNING:  Grecord will be 
-   PROGRAMS_GRECORD_ERROR="	gnome media profiles is disabled"
- fi
- 
--if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" == "xyes"; then
-+if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" = "xyes"; then
-   PROGRAMS_GRECORD="grecord"
- 
-   gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
-@@ -24186,7 +24186,7 @@ if test "${enable_vumeter+set}" = set; t
- else
-   enable_vumeter=yes
- fi;
--if test -n "$we_have_esd" && test "x$enable_vumeter" == "xyes"; then
-+if test -n "$we_have_esd" && test "x$enable_vumeter" = "xyes"; then
- 
- pkg_failed=no
- echo "$as_me:$LINENO: checking for VUMETER" >&5
-@@ -24304,7 +24304,7 @@ if test "${enable_gnomecd+set}" = set; t
- else
-   enable_gnomecd=yes
- fi;
--if test "x$enable_gnomecd" == "xyes"; then
-+if test "x$enable_gnomecd" = "xyes"; then
- 
- pkg_failed=no
- echo "$as_me:$LINENO: checking for GNOMECD" >&5
-@@ -24640,7 +24640,7 @@ fi
- 
- 
- 
--if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" == "xyes" ; then
-+if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" = "xyes" ; then
-   cdrom_header=""
- 
- for ac_header in linux/cdrom.h
-@@ -25510,7 +25510,7 @@ if test "${enable_gstprops+set}" = set; 
- else
-   enable_gstprops=yes
- fi;
--if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" == "xyes";
-+if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" = "xyes";
- then
-       COMMON_MODULES="gconf-2.0 libgnomeui-2.0 libglade-2.0 >= 1.99.12 gstreamer-$GST_MAJORMINOR"
- 
-@@ -25673,7 +25673,7 @@ if test "${enable_gstmix+set}" = set; th
- else
-   enable_gstmix=yes
- fi;
--if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" == "xyes";
-+if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" = "xyes";
- then
- 
- pkg_failed=no
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index f4f92bed5986..9429ae72b7ae 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -26,29 +26,27 @@ libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server
 libdata/pkgconfig/gnome-media-profiles.pc
 libexec/CDDBSlave2
 libexec/cddb-track-editor
-share/gnome/applications/cddb-slave.desktop
-share/gnome/applications/gnome-cd.desktop
-share/gnome/applications/gnome-sound-recorder.desktop
-share/gnome/applications/gnome-volume-control.desktop
-share/gnome/applications/gstreamer-properties.desktop
-share/gnome/applications/reclevel.desktop
-share/gnome/applications/vumeter.desktop
-share/gnome/gnome-media/glade/gnome-audio-profiles.glade2
-share/gnome/gnome-media/pixmaps/3dsound.png
-share/gnome/gnome-media/pixmaps/chain-broken.png
-share/gnome/gnome-media/pixmaps/chain.png
-share/gnome/gnome-media/pixmaps/headphones.png
-share/gnome/gnome-media/pixmaps/mixer.png
-share/gnome/gnome-media/pixmaps/noplay.png
-share/gnome/gnome-media/pixmaps/norecord.png
-share/gnome/gnome-media/pixmaps/phone.png
-share/gnome/gnome-media/pixmaps/play.png
-share/gnome/gnome-media/pixmaps/record.png
-share/gnome/gnome-media/pixmaps/tone.png
-share/gnome/gnome-media/pixmaps/video.png
-share/gnome/gnome-sound-recorder/ui/ui.xml
-share/gnome/gstreamer-properties/glade/gstreamer-properties.glade
-share/gnome/gstreamer-properties/icons/gstreamer-properties.png
+share/applications/cddb-slave.desktop
+share/applications/gnome-cd.desktop
+share/applications/gnome-sound-recorder.desktop
+share/applications/gnome-volume-control.desktop
+share/applications/gstreamer-properties.desktop
+share/applications/reclevel.desktop
+share/applications/vumeter.desktop
+%%DATADIR%%/glade/gnome-audio-profiles.glade2
+%%DATADIR%%/pixmaps/3dsound.png
+%%DATADIR%%/pixmaps/chain-broken.png
+%%DATADIR%%/pixmaps/chain.png
+%%DATADIR%%/pixmaps/headphones.png
+%%DATADIR%%/pixmaps/mixer.png
+%%DATADIR%%/pixmaps/noplay.png
+%%DATADIR%%/pixmaps/norecord.png
+%%DATADIR%%/pixmaps/phone.png
+%%DATADIR%%/pixmaps/play.png
+%%DATADIR%%/pixmaps/record.png
+%%DATADIR%%/pixmaps/tone.png
+%%DATADIR%%/pixmaps/video.png
+share/gnome-sound-recorder/ui/ui.xml
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
@@ -63,31 +61,11 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png
 share/gnome/help/gnome-cd/C/figures/stop_button.png
 share/gnome/help/gnome-cd/C/gnome-cd.xml
 share/gnome/help/gnome-cd/C/legal.xml
-share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/de/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/de/figures/eject_button.png
-share/gnome/help/gnome-cd/de/figures/forward_button.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd.png
-share/gnome/help/gnome-cd/de/figures/next_button.png
-share/gnome/help/gnome-cd/de/figures/pause_button.png
-share/gnome/help/gnome-cd/de/figures/play_button.png
-share/gnome/help/gnome-cd/de/figures/preferences_button.png
-share/gnome/help/gnome-cd/de/figures/previous_button.png
-share/gnome/help/gnome-cd/de/figures/rewind_button.png
-share/gnome/help/gnome-cd/de/figures/stop_button.png
-share/gnome/help/gnome-cd/de/gnome-cd.xml
-share/gnome/help/gnome-cd/de/legal.xml
 share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/es/figures/cdplayer_window.png
 share/gnome/help/gnome-cd/es/figures/eject_button.png
 share/gnome/help/gnome-cd/es/figures/forward_button.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd.png
 share/gnome/help/gnome-cd/es/figures/next_button.png
 share/gnome/help/gnome-cd/es/figures/pause_button.png
 share/gnome/help/gnome-cd/es/figures/play_button.png
@@ -96,15 +74,11 @@ share/gnome/help/gnome-cd/es/figures/previous_button.png
 share/gnome/help/gnome-cd/es/figures/rewind_button.png
 share/gnome/help/gnome-cd/es/figures/stop_button.png
 share/gnome/help/gnome-cd/es/gnome-cd.xml
-share/gnome/help/gnome-cd/es/legal.xml
 share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png
 share/gnome/help/gnome-cd/fr/figures/eject_button.png
 share/gnome/help/gnome-cd/fr/figures/forward_button.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd.png
 share/gnome/help/gnome-cd/fr/figures/next_button.png
 share/gnome/help/gnome-cd/fr/figures/pause_button.png
 share/gnome/help/gnome-cd/fr/figures/play_button.png
@@ -113,80 +87,11 @@ share/gnome/help/gnome-cd/fr/figures/previous_button.png
 share/gnome/help/gnome-cd/fr/figures/rewind_button.png
 share/gnome/help/gnome-cd/fr/figures/stop_button.png
 share/gnome/help/gnome-cd/fr/gnome-cd.xml
-share/gnome/help/gnome-cd/fr/legal.xml
-share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/it/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/it/figures/eject_button.png
-share/gnome/help/gnome-cd/it/figures/forward_button.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd.png
-share/gnome/help/gnome-cd/it/figures/next_button.png
-share/gnome/help/gnome-cd/it/figures/pause_button.png
-share/gnome/help/gnome-cd/it/figures/play_button.png
-share/gnome/help/gnome-cd/it/figures/preferences_button.png
-share/gnome/help/gnome-cd/it/figures/previous_button.png
-share/gnome/help/gnome-cd/it/figures/rewind_button.png
-share/gnome/help/gnome-cd/it/figures/stop_button.png
-share/gnome/help/gnome-cd/it/gnome-cd.xml
-share/gnome/help/gnome-cd/it/legal.xml
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ja/figures/eject_button.png
-share/gnome/help/gnome-cd/ja/figures/forward_button.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ja/figures/next_button.png
-share/gnome/help/gnome-cd/ja/figures/pause_button.png
-share/gnome/help/gnome-cd/ja/figures/play_button.png
-share/gnome/help/gnome-cd/ja/figures/preferences_button.png
-share/gnome/help/gnome-cd/ja/figures/previous_button.png
-share/gnome/help/gnome-cd/ja/figures/rewind_button.png
-share/gnome/help/gnome-cd/ja/figures/stop_button.png
-share/gnome/help/gnome-cd/ja/gnome-cd.xml
-share/gnome/help/gnome-cd/ja/legal.xml
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ko/figures/eject_button.png
-share/gnome/help/gnome-cd/ko/figures/forward_button.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ko/figures/next_button.png
-share/gnome/help/gnome-cd/ko/figures/pause_button.png
-share/gnome/help/gnome-cd/ko/figures/play_button.png
-share/gnome/help/gnome-cd/ko/figures/preferences_button.png
-share/gnome/help/gnome-cd/ko/figures/previous_button.png
-share/gnome/help/gnome-cd/ko/figures/rewind_button.png
-share/gnome/help/gnome-cd/ko/figures/stop_button.png
-share/gnome/help/gnome-cd/ko/gnome-cd.xml
-share/gnome/help/gnome-cd/ko/legal.xml
-share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/nl/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/nl/figures/eject_button.png
-share/gnome/help/gnome-cd/nl/figures/forward_button.png
-share/gnome/help/gnome-cd/nl/figures/next_button.png
-share/gnome/help/gnome-cd/nl/figures/pause_button.png
-share/gnome/help/gnome-cd/nl/figures/play_button.png
-share/gnome/help/gnome-cd/nl/figures/preferences_button.png
-share/gnome/help/gnome-cd/nl/figures/previous_button.png
-share/gnome/help/gnome-cd/nl/figures/rewind_button.png
-share/gnome/help/gnome-cd/nl/figures/stop_button.png
-share/gnome/help/gnome-cd/nl/gnome-cd.xml
-share/gnome/help/gnome-cd/nl/legal.xml
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
 share/gnome/help/gnome-cd/sv/figures/eject_button.png
 share/gnome/help/gnome-cd/sv/figures/forward_button.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd.png
 share/gnome/help/gnome-cd/sv/figures/next_button.png
 share/gnome/help/gnome-cd/sv/figures/pause_button.png
 share/gnome/help/gnome-cd/sv/figures/play_button.png
@@ -195,251 +100,49 @@ share/gnome/help/gnome-cd/sv/figures/previous_button.png
 share/gnome/help/gnome-cd/sv/figures/rewind_button.png
 share/gnome/help/gnome-cd/sv/figures/stop_button.png
 share/gnome/help/gnome-cd/sv/gnome-cd.xml
-share/gnome/help/gnome-cd/sv/legal.xml
-share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/uk/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/uk/figures/eject_button.png
-share/gnome/help/gnome-cd/uk/figures/forward_button.png
-share/gnome/help/gnome-cd/uk/figures/next_button.png
-share/gnome/help/gnome-cd/uk/figures/pause_button.png
-share/gnome/help/gnome-cd/uk/figures/play_button.png
-share/gnome/help/gnome-cd/uk/figures/preferences_button.png
-share/gnome/help/gnome-cd/uk/figures/previous_button.png
-share/gnome/help/gnome-cd/uk/figures/rewind_button.png
-share/gnome/help/gnome-cd/uk/figures/stop_button.png
-share/gnome/help/gnome-cd/uk/gnome-cd.xml
-share/gnome/help/gnome-cd/uk/legal.xml
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/zh_CN/figures/eject_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/forward_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd.png
-share/gnome/help/gnome-cd/zh_CN/figures/next_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/pause_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/play_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/preferences_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/previous_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/rewind_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_CN/legal.xml
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/zh_TW/figures/eject_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/forward_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd.png
-share/gnome/help/gnome-cd/zh_TW/figures/next_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/pause_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/play_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/preferences_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/previous_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_TW/legal.xml
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/C/legal.xml
+share/gnome/help/gnome-sound-recorder/es/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/es/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/fr/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/fr/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/oc/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/oc/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/sv/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/sv/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
-share/gnome/help/gnome-sound-recorder/uk/legal.xml
-share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
-share/gnome/help/gnome-volume-control/C/figures/gmix.png
 share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
 share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/C/legal.xml
-share/gnome/help/gnome-volume-control/uk/figures/gmix-prefs.png
-share/gnome/help/gnome-volume-control/uk/figures/gmix.png
-share/gnome/help/gnome-volume-control/uk/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/uk/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/uk/legal.xml
-share/gnome/help/grecord/de/figures/grecord-prefs-path.png
-share/gnome/help/grecord/de/figures/grecord-prefs-play.png
-share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/de/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/de/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/de/figures/grecord.png
-share/gnome/help/grecord/de/figures/grecord_window.png
-share/gnome/help/grecord/de/grecord.xml
-share/gnome/help/grecord/de/legal.xml
-share/gnome/help/grecord/es/figures/grecord-prefs-path.png
-share/gnome/help/grecord/es/figures/grecord-prefs-play.png
-share/gnome/help/grecord/es/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/es/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/es/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/es/figures/grecord.png
-share/gnome/help/grecord/es/figures/grecord_window.png
-share/gnome/help/grecord/es/grecord.xml
-share/gnome/help/grecord/es/legal.xml
-share/gnome/help/grecord/fr/figures/grecord-prefs-path.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-play.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/fr/figures/grecord.png
-share/gnome/help/grecord/fr/figures/grecord_window.png
-share/gnome/help/grecord/fr/grecord.xml
-share/gnome/help/grecord/fr/legal.xml
-share/gnome/help/grecord/it/figures/grecord-prefs-path.png
-share/gnome/help/grecord/it/figures/grecord-prefs-play.png
-share/gnome/help/grecord/it/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/it/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/it/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/it/figures/grecord.png
-share/gnome/help/grecord/it/figures/grecord_window.png
-share/gnome/help/grecord/it/grecord.xml
-share/gnome/help/grecord/it/legal.xml
-share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ja/figures/grecord.png
-share/gnome/help/grecord/ja/figures/grecord_window.png
-share/gnome/help/grecord/ja/grecord.xml
-share/gnome/help/grecord/ja/legal.xml
-share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ko/figures/grecord.png
-share/gnome/help/grecord/ko/figures/grecord_window.png
-share/gnome/help/grecord/ko/grecord.xml
-share/gnome/help/grecord/ko/legal.xml
-share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/sv/figures/grecord.png
-share/gnome/help/grecord/sv/figures/grecord_window.png
-share/gnome/help/grecord/sv/grecord.xml
-share/gnome/help/grecord/sv/legal.xml
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/zh_CN/figures/grecord.png
-share/gnome/help/grecord/zh_CN/figures/grecord_window.png
-share/gnome/help/grecord/zh_CN/grecord.xml
-share/gnome/help/grecord/zh_CN/legal.xml
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/zh_TW/figures/grecord.png
-share/gnome/help/grecord/zh_TW/figures/grecord_window.png
-share/gnome/help/grecord/zh_TW/grecord.xml
-share/gnome/help/grecord/zh_TW/legal.xml
+share/gnome/help/gnome-volume-control/es/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/es/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/fr/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/fr/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/oc/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/oc/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/sv/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/sv/gnome-volume-control.xml
 share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/C/legal.xml
-share/gnome/help/gstreamer-properties/uk/figures/gstreamer_properties_window.png
-share/gnome/help/gstreamer-properties/uk/gstreamer-properties.xml
-share/gnome/help/gstreamer-properties/uk/legal.xml
-share/gnome/idl/GNOME_Media_CDDBSlave2.idl
-share/gnome/omf/gnome-media/gnome-cd-C.omf
-share/gnome/omf/gnome-media/gnome-cd-de.omf
-share/gnome/omf/gnome-media/gnome-cd-es.omf
-share/gnome/omf/gnome-media/gnome-cd-fr.omf
-share/gnome/omf/gnome-media/gnome-cd-it.omf
-share/gnome/omf/gnome-media/gnome-cd-ja.omf
-share/gnome/omf/gnome-media/gnome-cd-ko.omf
-share/gnome/omf/gnome-media/gnome-cd-nl.omf
-share/gnome/omf/gnome-media/gnome-cd-sv.omf
-share/gnome/omf/gnome-media/gnome-cd-uk.omf
-share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf
-share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf
-share/gnome/omf/gnome-media/gnome-volume-control-C.omf
-share/gnome/omf/gnome-media/gnome-volume-control-uk.omf
-share/gnome/omf/gnome-media/grecord-C.omf
-share/gnome/omf/gnome-media/grecord-de.omf
-share/gnome/omf/gnome-media/grecord-es.omf
-share/gnome/omf/gnome-media/grecord-fr.omf
-share/gnome/omf/gnome-media/grecord-it.omf
-share/gnome/omf/gnome-media/grecord-ja.omf
-share/gnome/omf/gnome-media/grecord-ko.omf
-share/gnome/omf/gnome-media/grecord-sv.omf
-share/gnome/omf/gnome-media/grecord-uk.omf
-share/gnome/omf/gnome-media/grecord-zh_CN.omf
-share/gnome/omf/gnome-media/grecord-zh_TW.omf
-share/gnome/omf/gnome-media/gstreamer-properties-C.omf
-share/gnome/omf/gnome-media/gstreamer-properties-uk.omf
-share/gnome/pixmaps/gnome-cd.png
-share/gnome/pixmaps/gnome-cd/cd.png
-share/gnome/pixmaps/gnome-cd/disc.png
-share/gnome/pixmaps/gnome-cd/media-eject.png
-share/gnome/pixmaps/gnome-cd/once.png
-share/gnome/pixmaps/gnome-cd/repeat.png
-share/gnome/pixmaps/gnome-cd/themes/None/None.theme
-share/gnome/pixmaps/gnome-cd/themes/None/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-stop-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/bottom-left.png
-share/gnome/pixmaps/gnome-cd/themes/None/bottom-right.png
-share/gnome/pixmaps/gnome-cd/themes/None/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-eject.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-fwd.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-next.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-pause.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-play.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-prev.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-rew.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-stop.png
-share/gnome/pixmaps/gnome-cd/themes/None/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/None/middle-right.png
-share/gnome/pixmaps/gnome-cd/themes/None/middle.png
-share/gnome/pixmaps/gnome-cd/themes/None/top-left.png
-share/gnome/pixmaps/gnome-cd/themes/None/top-right.png
-share/gnome/pixmaps/gnome-cd/themes/None/top.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/lcd.theme
-share/gnome/pixmaps/gnome-cd/themes/lcd/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/middle-right.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/middle.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/top-left.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/top-right.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/top.png
-share/gnome/pixmaps/gnome-cd/themes/media/bottom-left.png
-share/gnome/pixmaps/gnome-cd/themes/media/bottom-right.png
-share/gnome/pixmaps/gnome-cd/themes/media/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/media/media.theme
-share/gnome/pixmaps/gnome-cd/themes/media/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/media/middle-right.png
-share/gnome/pixmaps/gnome-cd/themes/media/middle.png
-share/gnome/pixmaps/gnome-cd/themes/media/top-left.png
-share/gnome/pixmaps/gnome-cd/themes/media/top-right.png
-share/gnome/pixmaps/gnome-cd/themes/media/top.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle-right.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/red-lcd.theme
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-left.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png
-share/gnome/pixmaps/gnome-cd/track.png
-share/gnome/pixmaps/gnome-grecord.png
-share/gnome/pixmaps/gnome-mixer.png
-share/gnome/pixmaps/gnome-reclevel.png
-share/gnome/pixmaps/gnome-vumeter.png
-share/gnome/pixmaps/gstreamer-properties.png
+share/gnome/help/gstreamer-properties/es/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/es/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/fr/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/fr/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/oc/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/oc/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/sv/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/sv/gstreamer-properties.xml
+share/gstreamer-properties/glade/gstreamer-properties.glade
+share/gstreamer-properties/icons/gstreamer-properties.png
+share/icons/hicolor/48x48/apps/gnome-cd.png
+share/icons/hicolor/48x48/apps/gnome-grecord.png
+share/icons/hicolor/48x48/apps/gnome-reclevel.png
+share/icons/hicolor/48x48/apps/gnome-vumeter.png
+share/icons/hicolor/48x48/apps/gstreamer-properties.png
+share/idl/GNOME_Media_CDDBSlave2.idl
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
@@ -489,6 +192,7 @@ share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-media-2.0.mo
@@ -497,6 +201,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo
@@ -514,87 +219,121 @@ share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
-@dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
-@dirrm share/gnome/pixmaps/gnome-cd/themes/media
-@dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
-@dirrm share/gnome/pixmaps/gnome-cd/themes/None
-@dirrm share/gnome/pixmaps/gnome-cd/themes
-@dirrm share/gnome/pixmaps/gnome-cd
-@dirrm share/gnome/omf/gnome-media
-@dirrm share/gnome/help/gstreamer-properties/uk/figures
-@dirrm share/gnome/help/gstreamer-properties/uk
+share/pixmaps/gnome-cd/disc.png
+share/pixmaps/gnome-cd/once.png
+share/pixmaps/gnome-cd/repeat.png
+share/pixmaps/gnome-cd/themes/None/None.theme
+share/pixmaps/gnome-cd/themes/None/bottom-left.png
+share/pixmaps/gnome-cd/themes/None/bottom-right.png
+share/pixmaps/gnome-cd/themes/None/bottom.png
+share/pixmaps/gnome-cd/themes/None/middle-left.png
+share/pixmaps/gnome-cd/themes/None/middle-right.png
+share/pixmaps/gnome-cd/themes/None/middle.png
+share/pixmaps/gnome-cd/themes/None/top-left.png
+share/pixmaps/gnome-cd/themes/None/top-right.png
+share/pixmaps/gnome-cd/themes/None/top.png
+share/pixmaps/gnome-cd/themes/lcd/bottom-left.png
+share/pixmaps/gnome-cd/themes/lcd/bottom-right.png
+share/pixmaps/gnome-cd/themes/lcd/bottom.png
+share/pixmaps/gnome-cd/themes/lcd/lcd.theme
+share/pixmaps/gnome-cd/themes/lcd/middle-left.png
+share/pixmaps/gnome-cd/themes/lcd/middle-right.png
+share/pixmaps/gnome-cd/themes/lcd/middle.png
+share/pixmaps/gnome-cd/themes/lcd/top-left.png
+share/pixmaps/gnome-cd/themes/lcd/top-right.png
+share/pixmaps/gnome-cd/themes/lcd/top.png
+share/pixmaps/gnome-cd/themes/media/bottom-left.png
+share/pixmaps/gnome-cd/themes/media/bottom-right.png
+share/pixmaps/gnome-cd/themes/media/bottom.png
+share/pixmaps/gnome-cd/themes/media/media.theme
+share/pixmaps/gnome-cd/themes/media/middle-left.png
+share/pixmaps/gnome-cd/themes/media/middle-right.png
+share/pixmaps/gnome-cd/themes/media/middle.png
+share/pixmaps/gnome-cd/themes/media/top-left.png
+share/pixmaps/gnome-cd/themes/media/top-right.png
+share/pixmaps/gnome-cd/themes/media/top.png
+share/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png
+share/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png
+share/pixmaps/gnome-cd/themes/red-lcd/bottom.png
+share/pixmaps/gnome-cd/themes/red-lcd/middle-left.png
+share/pixmaps/gnome-cd/themes/red-lcd/middle-right.png
+share/pixmaps/gnome-cd/themes/red-lcd/middle.png
+share/pixmaps/gnome-cd/themes/red-lcd/red-lcd.theme
+share/pixmaps/gnome-cd/themes/red-lcd/top-left.png
+share/pixmaps/gnome-cd/themes/red-lcd/top-right.png
+share/pixmaps/gnome-cd/themes/red-lcd/top.png
+share/pixmaps/gnome-cd/track.png
+@dirrm share/pixmaps/gnome-cd/themes/red-lcd
+@dirrm share/pixmaps/gnome-cd/themes/media
+@dirrm share/pixmaps/gnome-cd/themes/lcd
+@dirrm share/pixmaps/gnome-cd/themes/None
+@dirrm share/pixmaps/gnome-cd/themes
+@dirrm share/pixmaps/gnome-cd
+@dirrm share/gstreamer-properties/icons
+@dirrm share/gstreamer-properties/glade
+@dirrm share/gstreamer-properties
+@dirrm share/gnome/help/gstreamer-properties/sv/figures
+@dirrm share/gnome/help/gstreamer-properties/sv
+@dirrm share/gnome/help/gstreamer-properties/oc/figures
+@dirrm share/gnome/help/gstreamer-properties/oc
+@dirrm share/gnome/help/gstreamer-properties/fr/figures
+@dirrm share/gnome/help/gstreamer-properties/fr
+@dirrm share/gnome/help/gstreamer-properties/es/figures
+@dirrm share/gnome/help/gstreamer-properties/es
 @dirrm share/gnome/help/gstreamer-properties/C/figures
 @dirrm share/gnome/help/gstreamer-properties/C
 @dirrm share/gnome/help/gstreamer-properties
-@dirrm share/gnome/help/grecord/zh_TW/figures
-@dirrm share/gnome/help/grecord/zh_TW
-@dirrm share/gnome/help/grecord/zh_CN/figures
-@dirrm share/gnome/help/grecord/zh_CN
-@dirrm share/gnome/help/grecord/sv/figures
-@dirrm share/gnome/help/grecord/sv
-@dirrm share/gnome/help/grecord/ko/figures
-@dirrm share/gnome/help/grecord/ko
-@dirrm share/gnome/help/grecord/ja/figures
-@dirrm share/gnome/help/grecord/ja
-@dirrm share/gnome/help/grecord/it/figures
-@dirrm share/gnome/help/grecord/it
-@dirrm share/gnome/help/grecord/fr/figures
-@dirrm share/gnome/help/grecord/fr
-@dirrm share/gnome/help/grecord/es/figures
-@dirrm share/gnome/help/grecord/es
-@dirrm share/gnome/help/grecord/de/figures
-@dirrm share/gnome/help/grecord/de
-@dirrm share/gnome/help/grecord
-@dirrm share/gnome/help/gnome-volume-control/uk/figures
-@dirrm share/gnome/help/gnome-volume-control/uk
+@dirrm share/gnome/help/gnome-volume-control/sv/figures
+@dirrm share/gnome/help/gnome-volume-control/sv
+@dirrm share/gnome/help/gnome-volume-control/oc/figures
+@dirrm share/gnome/help/gnome-volume-control/oc
+@dirrm share/gnome/help/gnome-volume-control/fr/figures
+@dirrm share/gnome/help/gnome-volume-control/fr
+@dirrm share/gnome/help/gnome-volume-control/es/figures
+@dirrm share/gnome/help/gnome-volume-control/es
 @dirrm share/gnome/help/gnome-volume-control/C/figures
 @dirrm share/gnome/help/gnome-volume-control/C
 @dirrm share/gnome/help/gnome-volume-control
 @dirrm share/gnome/help/gnome-sound-recorder/uk/figures
 @dirrm share/gnome/help/gnome-sound-recorder/uk
+@dirrm share/gnome/help/gnome-sound-recorder/sv/figures
+@dirrm share/gnome/help/gnome-sound-recorder/sv
+@dirrm share/gnome/help/gnome-sound-recorder/oc/figures
+@dirrm share/gnome/help/gnome-sound-recorder/oc
+@dirrm share/gnome/help/gnome-sound-recorder/fr/figures
+@dirrm share/gnome/help/gnome-sound-recorder/fr
+@dirrm share/gnome/help/gnome-sound-recorder/es/figures
+@dirrm share/gnome/help/gnome-sound-recorder/es
 @dirrm share/gnome/help/gnome-sound-recorder/C/figures
 @dirrm share/gnome/help/gnome-sound-recorder/C
 @dirrm share/gnome/help/gnome-sound-recorder
-@dirrm share/gnome/help/gnome-cd/zh_TW/figures
-@dirrm share/gnome/help/gnome-cd/zh_TW
-@dirrm share/gnome/help/gnome-cd/zh_CN/figures
-@dirrm share/gnome/help/gnome-cd/zh_CN
-@dirrm share/gnome/help/gnome-cd/uk/figures
-@dirrm share/gnome/help/gnome-cd/uk
 @dirrm share/gnome/help/gnome-cd/sv/figures
 @dirrm share/gnome/help/gnome-cd/sv
-@dirrm share/gnome/help/gnome-cd/nl/figures
-@dirrm share/gnome/help/gnome-cd/nl
-@dirrm share/gnome/help/gnome-cd/ko/figures
-@dirrm share/gnome/help/gnome-cd/ko
-@dirrm share/gnome/help/gnome-cd/ja/figures
-@dirrm share/gnome/help/gnome-cd/ja
-@dirrm share/gnome/help/gnome-cd/it/figures
-@dirrm share/gnome/help/gnome-cd/it
 @dirrm share/gnome/help/gnome-cd/fr/figures
 @dirrm share/gnome/help/gnome-cd/fr
 @dirrm share/gnome/help/gnome-cd/es/figures
 @dirrm share/gnome/help/gnome-cd/es
-@dirrm share/gnome/help/gnome-cd/de/figures
-@dirrm share/gnome/help/gnome-cd/de
 @dirrm share/gnome/help/gnome-cd/C/figures
 @dirrm share/gnome/help/gnome-cd/C
 @dirrm share/gnome/help/gnome-cd
-@dirrm share/gnome/gstreamer-properties/icons
-@dirrm share/gnome/gstreamer-properties/glade
-@dirrm share/gnome/gstreamer-properties
-@dirrm share/gnome/gnome-sound-recorder/ui
-@dirrm share/gnome/gnome-sound-recorder
-@dirrm share/gnome/gnome-media/pixmaps
-@dirrm share/gnome/gnome-media/glade
-@dirrm share/gnome/gnome-media
+@dirrm share/gnome-sound-recorder/ui
+@dirrm share/gnome-sound-recorder
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm include/gnome-media/profiles
 @dirrm include/gnome-media
 @dirrm include/cddb-slave2
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@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/mg/LC_MESSAGES
@@ -603,3 +342,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index 9c1e72a6fd3e..288c3e451828 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		gnomoradio
 PORTVERSION=		0.15.1
-PORTREVISION=		7
+PORTREVISION=		8
 CATEGORIES=		audio net
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,8 +25,8 @@ LIB_DEPENDS=		sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 USE_XLIB=		yes
 USE_GCC=		3.4+
 USE_GNOME=		gnomehack gnomeprefix
-INSTALLS_SHLIB=		yes
 USE_AUTOTOOLS=		libtool:15
+USE_LDCONFIG=		yes
 LIBTOOLFLAGS=		--tag=CXX
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gnomoradio/pkg-plist b/audio/gnomoradio/pkg-plist
index 80747b209dd5..bfea24896d21 100644
--- a/audio/gnomoradio/pkg-plist
+++ b/audio/gnomoradio/pkg-plist
@@ -41,9 +41,10 @@ lib/libroboradio.la
 lib/libroboradio.so
 lib/libroboradio.so.0
 sbin/rainbow-hub
-share/gnome/applications/gnomoradio.desktop
-share/gnome/pixmaps/gnomoradio.png
-share/gnome/pixmaps/gnomoradio/gnomoradio-heart.png
+share/applications/gnomoradio.desktop
+share/pixmaps/gnomoradio.png
+share/pixmaps/gnomoradio/gnomoradio-heart.png
 @dirrm include/rainbow
 @dirrm include/roboradio
-@dirrm share/gnome/pixmaps/gnomoradio
+@dirrm share/pixmaps/gnomoradio
+@dirrmtry share/applications
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
new file mode 100644
index 000000000000..0cafa575afe2
--- /dev/null
+++ b/audio/goobox/Makefile
@@ -0,0 +1,47 @@
+# New ports collection makefile for:	guikachu
+# Date created:		11 Nov 2004
+# Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/audio/goobox/Makefile,v 1.25 2007/08/15 03:03:09 mezz Exp $
+#
+
+PORTNAME=	goobox
+PORTVERSION=	1.9.2
+CATEGORIES=	audio gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	CD player and ripper for GNOME Desktop environment
+
+LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
+
+USE_XLIB=	yes
+USE_GETTEXT=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libglade2 libbonobo \
+		gnomedocutils nautiluscdburner
+USE_GSTREAMER=	cdparanoia gconf core
+GNU_CONFIGURE=	yes
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	goobox.schemas
+
+OPTIONS=	NOTIFY "Enable libnotify support" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=	--enable-notification
+.else
+CONFIGURE_ARGS+=	--disable-notification
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/goobox/distinfo b/audio/goobox/distinfo
new file mode 100644
index 000000000000..a7cfb0a75120
--- /dev/null
+++ b/audio/goobox/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/goobox-1.9.2.tar.bz2) = c086c224e2680ebf0890695a6c6f417d
+SHA256 (gnome2/goobox-1.9.2.tar.bz2) = 09c025e6deab5101b23cfdcbea8a1e883e15d59bfb4c3a2888c101c7882408c5
+SIZE (gnome2/goobox-1.9.2.tar.bz2) = 553022
diff --git a/audio/goobox/files/patch-src_cd-drive.c b/audio/goobox/files/patch-src_cd-drive.c
new file mode 100644
index 000000000000..44f796b1aa44
--- /dev/null
+++ b/audio/goobox/files/patch-src_cd-drive.c
@@ -0,0 +1,12 @@
+--- src/cd-drive.c.orig	Sun Dec 24 22:45:32 2006
++++ src/cd-drive.c	Sun Dec 24 22:45:12 2006
+@@ -82,6 +82,9 @@ struct CDDrivePriv {
+ 	char *udi;
+ };
+ 
++static int get_device_max_read_speed (char *device);
++static int get_device_max_write_speed (char *device);
++
+ static CDDrive *cd_drive_new (void);
+ 
+ /* Utility functions, be careful to have a match with what's use in the
diff --git a/audio/goobox/pkg-descr b/audio/goobox/pkg-descr
new file mode 100644
index 000000000000..c263704fda75
--- /dev/null
+++ b/audio/goobox/pkg-descr
@@ -0,0 +1,4 @@
+Goobox is a CD player and ripper for the GNOME Desktop environment,
+it uses gstreamer to play and rip CDs and cddb-slave2 (distributed
+with gnome-media) to get and edit CD metadata such as track titles
+and album name.
diff --git a/audio/goobox/pkg-plist b/audio/goobox/pkg-plist
new file mode 100644
index 000000000000..6086d68a8e9f
--- /dev/null
+++ b/audio/goobox/pkg-plist
@@ -0,0 +1,70 @@
+bin/goobox
+libdata/bonobo/servers/GNOME_Goobox.server
+share/application-registry/goobox.applications
+share/applications/goobox.desktop
+share/gnome/help/goobox/C/goobox.xml
+share/gnome/help/goobox/C/legal.xml
+share/gnome/help/goobox/ca/goobox.xml
+share/gnome/help/goobox/es/goobox.xml
+share/gnome/help/goobox/sv/goobox.xml
+%%DATADIR%%/glade/cover_chooser.glade
+%%DATADIR%%/glade/extract_dialog.glade
+%%DATADIR%%/glade/format_dialog.glade
+%%DATADIR%%/glade/preferences.glade
+%%DATADIR%%/glade/properties.glade
+%%DATADIR%%/glade/ripper_dialog.glade
+share/icons/hicolor/48x48/apps/goobox.png
+share/locale/ar/LC_MESSAGES/goobox.mo
+share/locale/bg/LC_MESSAGES/goobox.mo
+share/locale/ca/LC_MESSAGES/goobox.mo
+share/locale/cs/LC_MESSAGES/goobox.mo
+share/locale/da/LC_MESSAGES/goobox.mo
+share/locale/de/LC_MESSAGES/goobox.mo
+share/locale/dz/LC_MESSAGES/goobox.mo
+share/locale/el/LC_MESSAGES/goobox.mo
+share/locale/en_CA/LC_MESSAGES/goobox.mo
+share/locale/en_GB/LC_MESSAGES/goobox.mo
+share/locale/es/LC_MESSAGES/goobox.mo
+share/locale/eu/LC_MESSAGES/goobox.mo
+share/locale/fi/LC_MESSAGES/goobox.mo
+share/locale/fr/LC_MESSAGES/goobox.mo
+share/locale/hu/LC_MESSAGES/goobox.mo
+share/locale/it/LC_MESSAGES/goobox.mo
+share/locale/ja/LC_MESSAGES/goobox.mo
+share/locale/ko/LC_MESSAGES/goobox.mo
+share/locale/lt/LC_MESSAGES/goobox.mo
+share/locale/lv/LC_MESSAGES/goobox.mo
+share/locale/nb/LC_MESSAGES/goobox.mo
+share/locale/ne/LC_MESSAGES/goobox.mo
+share/locale/nl/LC_MESSAGES/goobox.mo
+share/locale/oc/LC_MESSAGES/goobox.mo
+share/locale/pa/LC_MESSAGES/goobox.mo
+share/locale/pl/LC_MESSAGES/goobox.mo
+share/locale/pt/LC_MESSAGES/goobox.mo
+share/locale/pt_BR/LC_MESSAGES/goobox.mo
+share/locale/ru/LC_MESSAGES/goobox.mo
+share/locale/rw/LC_MESSAGES/goobox.mo
+share/locale/sq/LC_MESSAGES/goobox.mo
+share/locale/sv/LC_MESSAGES/goobox.mo
+share/locale/vi/LC_MESSAGES/goobox.mo
+share/locale/zh_CN/LC_MESSAGES/goobox.mo
+share/locale/zh_TW/LC_MESSAGES/goobox.mo
+share/omf/goobox/goobox-C.omf
+share/omf/goobox/goobox-ca.omf
+share/omf/goobox/goobox-es.omf
+share/omf/goobox/goobox-sv.omf
+@dirrm share/omf/goobox
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
+@dirrm share/gnome/help/goobox/sv
+@dirrm share/gnome/help/goobox/es
+@dirrm share/gnome/help/goobox/ca
+@dirrm share/gnome/help/goobox/C
+@dirrm share/gnome/help/goobox
+@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
+@dirrmtry share/applications
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 2488dbc18757..d38bed2e9c6e 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gqmpeg
 PORTVERSION=	0.20.0
-PORTREVISION=	2
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES+=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -41,10 +41,8 @@ MAN1=		gqmpeg.1
 USE_GNOME+=	gnomeprefix gnomelibs
 PKGNAMESUFFIX=	-gnome
 CONFIGURE_ENV+=	USE_GNOME="yes"
-PLIST_SUB+=	DATADIR="share/gnome"
 .else
 CONFIGURE_ENV+=	USE_GNOME=""
-PLIST_SUB+=	DATADIR="share"
 .endif
 
 .if !defined(WITH_MPG321)
diff --git a/audio/gqmpeg/files/patch-ad b/audio/gqmpeg/files/patch-ad
deleted file mode 100644
index eb000e4032b0..000000000000
--- a/audio/gqmpeg/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Jan 20 09:20:14 2002
-+++ Makefile.in	Sun Jan 20 09:20:32 2002
-@@ -118,7 +118,7 @@
- skindir = $(prefix)/share/gqmpeg/skins
- skin_DATA = SKIN-SPECS README
- 
--@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/gnome/apps/Multimedia
-+@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/apps/Multimedia
- @HAVE_GNOME_TRUE@desktop_DATA = @HAVE_GNOME_TRUE@gqmpeg.desktop
- 
- @HAVE_GNOME_TRUE@icondir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/pixmaps
diff --git a/audio/gqmpeg/pkg-plist b/audio/gqmpeg/pkg-plist
index 91bfcf96c42c..50886051819f 100644
--- a/audio/gqmpeg/pkg-plist
+++ b/audio/gqmpeg/pkg-plist
@@ -1,7 +1,7 @@
 bin/gqmpeg
 bin/gqmpeg-shoutcast-plugin.sh
-%%GNOME:%%%%DATADIR%%/apps/Multimedia/gqmpeg.desktop
-%%GNOME:%%%%DATADIR%%/pixmaps/gqmpeg.png
+%%GNOME:%%share/gnome/apps/Multimedia/gqmpeg.desktop
+%%GNOME:%%share/pixmaps/gqmpeg.png
 share/gqmpeg/skins/README
 share/gqmpeg/skins/SKIN-SPECS
 share/gqmpeg/skins/mrclean/blue-handle-24.png
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index ed62d7764db1..8d6db65eae98 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gqradio
 PORTVERSION=	1.9.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=gqmpeg
@@ -25,9 +25,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|share/gqradio|share/gnome/gqradio|; \
-		 s|\(doc/gqradio\)-\$$VERSION|\1|' \
+	@${REINPLACE_CMD} -e 's|\(doc/gqradio\)-\$$VERSION|\1|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|^\(readmedir = \).*|\1$$(prefix)/share/doc/gqradio|; \
diff --git a/audio/gqradio/pkg-plist b/audio/gqradio/pkg-plist
index 1a551fabbda0..092e0efa0601 100644
--- a/audio/gqradio/pkg-plist
+++ b/audio/gqradio/pkg-plist
@@ -3,96 +3,97 @@ share/doc/gqradio/ChangeLog
 share/doc/gqradio/README
 share/doc/gqradio/SKIN-SPECS
 share/doc/gqradio/TODO
-share/gnome/applications/gqradio.desktop
-share/gnome/gqradio/skins/SKIN-SPECS
-share/gnome/gqradio/skins/default/btn-grey-34x12-advanced1.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-advanced2.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-clear.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-config.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-del.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-scan.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-set.png
-share/gnome/gqradio/skins/default/btn-grey-34x20-mode.png
-share/gnome/gqradio/skins/default/btn-grey-34x20-mute.png
-share/gnome/gqradio/skins/default/btn-grey-42x20-down.png
-share/gnome/gqradio/skins/default/btn-grey-42x20-up.png
-share/gnome/gqradio/skins/default/btn-grey-expand.png
-share/gnome/gqradio/skins/default/btn-grey-shrink.png
-share/gnome/gqradio/skins/default/btn-grey-sizer.png
-share/gnome/gqradio/skins/default/btn-pda-16-minus.png
-share/gnome/gqradio/skins/default/btn-pda-16-plus.png
-share/gnome/gqradio/skins/default/btn-pda-exit.png
-share/gnome/gqradio/skins/default/btn-pda-iconify.png
-share/gnome/gqradio/skins/default/btn-pos-14-down.png
-share/gnome/gqradio/skins/default/btn-pos-14-up.png
-share/gnome/gqradio/skins/default/digit-digital-15-aa.png
-share/gnome/gqradio/skins/default/digit-digital-24-aa.png
-share/gnome/gqradio/skins/default/item-cycle-6.png
-share/gnome/gqradio/skins/default/item-radio-mute-large.png
-share/gnome/gqradio/skins/default/item-radio-scanning-11.png
-share/gnome/gqradio/skins/default/item-radio-stereo.png
-share/gnome/gqradio/skins/default/item-radio-strength-9.png
-share/gnome/gqradio/skins/default/item-radio-tunemode.png
-share/gnome/gqradio/skins/default/item-radio-volume-19.png
-share/gnome/gqradio/skins/default/item-set.png
-share/gnome/gqradio/skins/default/list-pos-back.png
-share/gnome/gqradio/skins/default/list-pos-row-menu.png
-share/gnome/gqradio/skins/default/list-pos-row.png
-share/gnome/gqradio/skins/default/main-pos-blank.png
-share/gnome/gqradio/skins/default/main-pos-extra.png
-share/gnome/gqradio/skins/default/menu_back_green.png
-share/gnome/gqradio/skins/default/menu_list_icons.png
-share/gnome/gqradio/skins/default/pic-dot.png
-share/gnome/gqradio/skins/default/pic-mhz.png
-share/gnome/gqradio/skins/default/skindata
-share/gnome/gqradio/skins/default/skindata_advanced
-share/gnome/gqradio/skins/default/skindata_menu
-share/gnome/gqradio/skins/default/skindata_presets
-share/gnome/gqradio/skins/default/skindata_presets_advanced
-share/gnome/gqradio/skins/default/skindata_submenu
-share/gnome/gqradio/skins/default/slider-pos-14h.png
-share/gnome/gqradio/skins/skyblue/back-blue.png
-share/gnome/gqradio/skins/skyblue/back-list-blue.png
-share/gnome/gqradio/skins/skyblue/back-menu-blue.png
-share/gnome/gqradio/skins/skyblue/btn-22-sizer2.png
-share/gnome/gqradio/skins/skyblue/btn-blue14-fade-close.png
-share/gnome/gqradio/skins/skyblue/btn-blue14-fade-down.png
-share/gnome/gqradio/skins/skyblue/btn-blue14-fade-iconify.png
-share/gnome/gqradio/skins/skyblue/btn-blue14-fade-up.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-clear.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-config.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-left.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-list.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-minus.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-mode3.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-mute.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-right.png
-share/gnome/gqradio/skins/skyblue/btn-blue22t-fade-add.png
-share/gnome/gqradio/skins/skyblue/btn-blue22t-fade-scan.png
-share/gnome/gqradio/skins/skyblue/digit-digital-15-aa.png
-share/gnome/gqradio/skins/skyblue/digit-digital-24-aa.png
-share/gnome/gqradio/skins/skyblue/item-cycle-6.png
-share/gnome/gqradio/skins/skyblue/item-radio-mute-large.png
-share/gnome/gqradio/skins/skyblue/item-radio-tunemode.png
-share/gnome/gqradio/skins/skyblue/item-set.png
-share/gnome/gqradio/skins/skyblue/item-signal4.png
-share/gnome/gqradio/skins/skyblue/item-volume12-shadow.png
-share/gnome/gqradio/skins/skyblue/list-back.png
-share/gnome/gqradio/skins/skyblue/list-menu-icons.png
-share/gnome/gqradio/skins/skyblue/list-menu-row20.png
-share/gnome/gqradio/skins/skyblue/list-row16.png
-share/gnome/gqradio/skins/skyblue/menu_list_icons.png
-share/gnome/gqradio/skins/skyblue/pic-dot.png
-share/gnome/gqradio/skins/skyblue/pic-mhz.png
-share/gnome/gqradio/skins/skyblue/skindata
-share/gnome/gqradio/skins/skyblue/skindata_menu
-share/gnome/gqradio/skins/skyblue/skindata_presets
-share/gnome/gqradio/skins/skyblue/skindata_submenu
-share/gnome/gqradio/skins/skyblue/slider-vert-24.png
-share/gnome/pixmaps/gqradio.png
+share/applications/gqradio.desktop
+share/gqradio/skins/SKIN-SPECS
+share/gqradio/skins/default/btn-grey-34x12-advanced1.png
+share/gqradio/skins/default/btn-grey-34x12-advanced2.png
+share/gqradio/skins/default/btn-grey-34x12-clear.png
+share/gqradio/skins/default/btn-grey-34x12-config.png
+share/gqradio/skins/default/btn-grey-34x12-del.png
+share/gqradio/skins/default/btn-grey-34x12-scan.png
+share/gqradio/skins/default/btn-grey-34x12-set.png
+share/gqradio/skins/default/btn-grey-34x20-mode.png
+share/gqradio/skins/default/btn-grey-34x20-mute.png
+share/gqradio/skins/default/btn-grey-42x20-down.png
+share/gqradio/skins/default/btn-grey-42x20-up.png
+share/gqradio/skins/default/btn-grey-expand.png
+share/gqradio/skins/default/btn-grey-shrink.png
+share/gqradio/skins/default/btn-grey-sizer.png
+share/gqradio/skins/default/btn-pda-16-minus.png
+share/gqradio/skins/default/btn-pda-16-plus.png
+share/gqradio/skins/default/btn-pda-exit.png
+share/gqradio/skins/default/btn-pda-iconify.png
+share/gqradio/skins/default/btn-pos-14-down.png
+share/gqradio/skins/default/btn-pos-14-up.png
+share/gqradio/skins/default/digit-digital-15-aa.png
+share/gqradio/skins/default/digit-digital-24-aa.png
+share/gqradio/skins/default/item-cycle-6.png
+share/gqradio/skins/default/item-radio-mute-large.png
+share/gqradio/skins/default/item-radio-scanning-11.png
+share/gqradio/skins/default/item-radio-stereo.png
+share/gqradio/skins/default/item-radio-strength-9.png
+share/gqradio/skins/default/item-radio-tunemode.png
+share/gqradio/skins/default/item-radio-volume-19.png
+share/gqradio/skins/default/item-set.png
+share/gqradio/skins/default/list-pos-back.png
+share/gqradio/skins/default/list-pos-row-menu.png
+share/gqradio/skins/default/list-pos-row.png
+share/gqradio/skins/default/main-pos-blank.png
+share/gqradio/skins/default/main-pos-extra.png
+share/gqradio/skins/default/menu_back_green.png
+share/gqradio/skins/default/menu_list_icons.png
+share/gqradio/skins/default/pic-dot.png
+share/gqradio/skins/default/pic-mhz.png
+share/gqradio/skins/default/skindata
+share/gqradio/skins/default/skindata_advanced
+share/gqradio/skins/default/skindata_menu
+share/gqradio/skins/default/skindata_presets
+share/gqradio/skins/default/skindata_presets_advanced
+share/gqradio/skins/default/skindata_submenu
+share/gqradio/skins/default/slider-pos-14h.png
+share/gqradio/skins/skyblue/back-blue.png
+share/gqradio/skins/skyblue/back-list-blue.png
+share/gqradio/skins/skyblue/back-menu-blue.png
+share/gqradio/skins/skyblue/btn-22-sizer2.png
+share/gqradio/skins/skyblue/btn-blue14-fade-close.png
+share/gqradio/skins/skyblue/btn-blue14-fade-down.png
+share/gqradio/skins/skyblue/btn-blue14-fade-iconify.png
+share/gqradio/skins/skyblue/btn-blue14-fade-up.png
+share/gqradio/skins/skyblue/btn-blue22-fade-clear.png
+share/gqradio/skins/skyblue/btn-blue22-fade-config.png
+share/gqradio/skins/skyblue/btn-blue22-fade-left.png
+share/gqradio/skins/skyblue/btn-blue22-fade-list.png
+share/gqradio/skins/skyblue/btn-blue22-fade-minus.png
+share/gqradio/skins/skyblue/btn-blue22-fade-mode3.png
+share/gqradio/skins/skyblue/btn-blue22-fade-mute.png
+share/gqradio/skins/skyblue/btn-blue22-fade-right.png
+share/gqradio/skins/skyblue/btn-blue22t-fade-add.png
+share/gqradio/skins/skyblue/btn-blue22t-fade-scan.png
+share/gqradio/skins/skyblue/digit-digital-15-aa.png
+share/gqradio/skins/skyblue/digit-digital-24-aa.png
+share/gqradio/skins/skyblue/item-cycle-6.png
+share/gqradio/skins/skyblue/item-radio-mute-large.png
+share/gqradio/skins/skyblue/item-radio-tunemode.png
+share/gqradio/skins/skyblue/item-set.png
+share/gqradio/skins/skyblue/item-signal4.png
+share/gqradio/skins/skyblue/item-volume12-shadow.png
+share/gqradio/skins/skyblue/list-back.png
+share/gqradio/skins/skyblue/list-menu-icons.png
+share/gqradio/skins/skyblue/list-menu-row20.png
+share/gqradio/skins/skyblue/list-row16.png
+share/gqradio/skins/skyblue/menu_list_icons.png
+share/gqradio/skins/skyblue/pic-dot.png
+share/gqradio/skins/skyblue/pic-mhz.png
+share/gqradio/skins/skyblue/skindata
+share/gqradio/skins/skyblue/skindata_menu
+share/gqradio/skins/skyblue/skindata_presets
+share/gqradio/skins/skyblue/skindata_submenu
+share/gqradio/skins/skyblue/slider-vert-24.png
+share/pixmaps/gqradio.png
 share/locale/fr/LC_MESSAGES/gqradio.mo
 @dirrm share/doc/gqradio
-@dirrm share/gnome/gqradio/skins/default
-@dirrm share/gnome/gqradio/skins/skyblue
-@dirrm share/gnome/gqradio/skins
-@dirrm share/gnome/gqradio
+@dirrm share/gqradio/skins/default
+@dirrm share/gqradio/skins/skyblue
+@dirrm share/gqradio/skins
+@dirrm share/gqradio
+@dirrmtry share/applications
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index f6cc0ed502bc..7979fd2c1343 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -3,11 +3,11 @@
 # Whom:					kbyanc@posi.net
 #
 # $FreeBSD$
-#
+#    $MCom: ports/audio/grip/Makefile,v 1.4 2007/05/19 21:35:57 marcus Exp $
 
 PORTNAME=	grip
 PORTVERSION=	3.2.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/grip/pkg-plist b/audio/grip/pkg-plist
index e0dd0fa4ea9f..698ac75724ec 100644
--- a/audio/grip/pkg-plist
+++ b/audio/grip/pkg-plist
@@ -1,5 +1,5 @@
 bin/grip
-share/gnome/applications/grip.desktop
+share/applications/grip.desktop
 share/gnome/help/grip/C/cdconfig.png
 share/gnome/help/grip/C/cdplayer.png
 share/gnome/help/grip/C/cdplayersmall.png
@@ -48,7 +48,7 @@ share/gnome/help/grip/C/smile8.png
 share/gnome/help/grip/C/stop.png
 share/gnome/help/grip/C/trkedit.png
 share/gnome/help/grip/C/volume.png
-share/gnome/pixmaps/gripicon.png
+share/pixmaps/gripicon.png
 share/locale/be/LC_MESSAGES/grip-2.2.mo
 share/locale/bg/LC_MESSAGES/grip-2.2.mo
 share/locale/ca/LC_MESSAGES/grip-2.2.mo
@@ -67,3 +67,4 @@ share/locale/zh_TW/LC_MESSAGES/grip-2.2.mo
 @dirrm share/gnome/help/grip
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/applications
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index c4a89c9ff8f8..afd7b236f0b8 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -3,10 +3,11 @@
 # Whom:					Vincent Tantardini <vinc@freebsd-fr.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gspeakers/Makefile,v 1.6 2007/05/30 17:08:11 mezz Exp $
 
 PORTNAME=	gspeakers
 PORTVERSION=	0.11
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,18 +38,12 @@ post-extract:
 	@${FIND} ${WRKSRC} -type l -delete
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/gnome/apps/|/apps/|g' \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(datadir)/pixmaps|$$(pkgdatadir)/pixmaps|g' \
 		${WRKSRC}/pixmaps/Makefile.in
 	@${REINPLACE_CMD} -e 's|-Wall -O0|@CXXFLAGS@|g' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(datadir)/xml|$$(pkgdatadir)/xml|g' \
 		${WRKSRC}/xml/Makefile.in
-	@${FIND} ${WRKSRC} \( -name "*.cc" -or -name "*.xml" \) | \
-		${XARGS} ${REINPLACE_CMD} -e \
-		's|/share/pixmaps/|/share/gnome/gspeakers/pixmaps/|g ; \
-		 s|/share/xml/|/share/gnome/gspeakers/xml/|g'
 
 pre-configure:
 	@${CP} ${AUTOMAKE_DIR}/depcomp ${WRKSRC}
diff --git a/audio/gspeakers/pkg-plist b/audio/gspeakers/pkg-plist
index 9cf972bac714..03304c9ccc74 100644
--- a/audio/gspeakers/pkg-plist
+++ b/audio/gspeakers/pkg-plist
@@ -1,57 +1,57 @@
 bin/gspeakers
 share/gnome/apps/Utilities/gspeakers.desktop
-share/gnome/gspeakers/pixmaps/append_enclosure_24.png
-share/gnome/gspeakers/pixmaps/append_plot_enclosure_24.png
-share/gnome/gspeakers/pixmaps/delete_crossover_16.png
-share/gnome/gspeakers/pixmaps/delete_crossover_24.png
-share/gnome/gspeakers/pixmaps/delete_driver_16.png
-share/gnome/gspeakers/pixmaps/delete_driver_24.png
-share/gnome/gspeakers/pixmaps/delete_enclosure_16.png
-share/gnome/gspeakers/pixmaps/delete_enclosure_24.png
-share/gnome/gspeakers/pixmaps/delete_plot_16.png
-share/gnome/gspeakers/pixmaps/delete_plot_24.png
-share/gnome/gspeakers/pixmaps/driver_small.png
-share/gnome/gspeakers/pixmaps/filter_small.png
-share/gnome/gspeakers/pixmaps/measure_small.png
-share/gnome/gspeakers/pixmaps/open_xml_16.png
-share/gnome/gspeakers/pixmaps/open_xml_24.png
-share/gnome/gspeakers/pixmaps/opt_enclosure_16.png
-share/gnome/gspeakers/pixmaps/opt_enclosure_24.png
-share/gnome/gspeakers/pixmaps/plot_16.png
-share/gnome/gspeakers/pixmaps/save_as_xml_16.png
-share/gnome/gspeakers/pixmaps/save_as_xml_24.png
-share/gnome/gspeakers/pixmaps/save_xml_16.png
-share/gnome/gspeakers/pixmaps/save_xml_24.png
-share/gnome/gspeakers/pixmaps/speaker_small.png
-share/gnome/gspeakers/pixmaps/stock_menu_about.png
-share/gnome/gspeakers/pixmaps/stock_new_crossover_16.png
-share/gnome/gspeakers/pixmaps/stock_new_crossover_copy_16.png
-share/gnome/gspeakers/pixmaps/stock_new_crossover_copy_24.png
-share/gnome/gspeakers/pixmaps/stock_new_crossover_xml_16.png
-share/gnome/gspeakers/pixmaps/stock_new_crossover_xml_24.png
-share/gnome/gspeakers/pixmaps/stock_new_driver_16.png
-share/gnome/gspeakers/pixmaps/stock_new_driver_24.png
-share/gnome/gspeakers/pixmaps/stock_new_driver_xml_16.png
-share/gnome/gspeakers/pixmaps/stock_new_driver_xml_24.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_16.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_24.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_copy_16.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_copy_24.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_xml_16.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_xml_24.png
-share/gnome/gspeakers/pixmaps/stock_plot_crossover_16.png
-share/gnome/gspeakers/pixmaps/stock_plot_crossover_24.png
-share/gnome/gspeakers/xml/box1.xml
-share/gnome/gspeakers/xml/crossover1.xml
-share/gnome/gspeakers/xml/morelmdt32s.frf
-share/gnome/gspeakers/xml/peerles115dt-26-72sf.frf
-share/gnome/gspeakers/xml/seasl14rcyp.frf
-share/gnome/gspeakers/xml/seasl21rn4xp.frf
-share/gnome/gspeakers/xml/seast14rcyph.frf
-share/gnome/gspeakers/xml/vifa.xml
-share/gnome/gspeakers/xml/vifad27tg-05-06.frf
-share/gnome/gspeakers/xml/vifap21wo-20-08.frf
-share/gnome/pixmaps/gspeakers.png
-@dirrm share/gnome/gspeakers/xml
-@dirrm share/gnome/gspeakers/pixmaps
-@dirrm share/gnome/gspeakers
+share/gspeakers/pixmaps/append_enclosure_24.png
+share/gspeakers/pixmaps/append_plot_enclosure_24.png
+share/gspeakers/pixmaps/delete_crossover_16.png
+share/gspeakers/pixmaps/delete_crossover_24.png
+share/gspeakers/pixmaps/delete_driver_16.png
+share/gspeakers/pixmaps/delete_driver_24.png
+share/gspeakers/pixmaps/delete_enclosure_16.png
+share/gspeakers/pixmaps/delete_enclosure_24.png
+share/gspeakers/pixmaps/delete_plot_16.png
+share/gspeakers/pixmaps/delete_plot_24.png
+share/gspeakers/pixmaps/driver_small.png
+share/gspeakers/pixmaps/filter_small.png
+share/gspeakers/pixmaps/measure_small.png
+share/gspeakers/pixmaps/open_xml_16.png
+share/gspeakers/pixmaps/open_xml_24.png
+share/gspeakers/pixmaps/opt_enclosure_16.png
+share/gspeakers/pixmaps/opt_enclosure_24.png
+share/gspeakers/pixmaps/plot_16.png
+share/gspeakers/pixmaps/save_as_xml_16.png
+share/gspeakers/pixmaps/save_as_xml_24.png
+share/gspeakers/pixmaps/save_xml_16.png
+share/gspeakers/pixmaps/save_xml_24.png
+share/gspeakers/pixmaps/speaker_small.png
+share/gspeakers/pixmaps/stock_menu_about.png
+share/gspeakers/pixmaps/stock_new_crossover_16.png
+share/gspeakers/pixmaps/stock_new_crossover_copy_16.png
+share/gspeakers/pixmaps/stock_new_crossover_copy_24.png
+share/gspeakers/pixmaps/stock_new_crossover_xml_16.png
+share/gspeakers/pixmaps/stock_new_crossover_xml_24.png
+share/gspeakers/pixmaps/stock_new_driver_16.png
+share/gspeakers/pixmaps/stock_new_driver_24.png
+share/gspeakers/pixmaps/stock_new_driver_xml_16.png
+share/gspeakers/pixmaps/stock_new_driver_xml_24.png
+share/gspeakers/pixmaps/stock_new_enclosure_16.png
+share/gspeakers/pixmaps/stock_new_enclosure_24.png
+share/gspeakers/pixmaps/stock_new_enclosure_copy_16.png
+share/gspeakers/pixmaps/stock_new_enclosure_copy_24.png
+share/gspeakers/pixmaps/stock_new_enclosure_xml_16.png
+share/gspeakers/pixmaps/stock_new_enclosure_xml_24.png
+share/gspeakers/pixmaps/stock_plot_crossover_16.png
+share/gspeakers/pixmaps/stock_plot_crossover_24.png
+share/gspeakers/xml/box1.xml
+share/gspeakers/xml/crossover1.xml
+share/gspeakers/xml/morelmdt32s.frf
+share/gspeakers/xml/peerles115dt-26-72sf.frf
+share/gspeakers/xml/seasl14rcyp.frf
+share/gspeakers/xml/seasl21rn4xp.frf
+share/gspeakers/xml/seast14rcyph.frf
+share/gspeakers/xml/vifa.xml
+share/gspeakers/xml/vifad27tg-05-06.frf
+share/gspeakers/xml/vifap21wo-20-08.frf
+share/pixmaps/gspeakers.png
+@dirrm share/gspeakers/xml
+@dirrm share/gspeakers/pixmaps
+@dirrm share/gspeakers
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 46eb6d71fae2..afab0b60db09 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libao
 PORTVERSION=	0.8.8
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/ao/
 
diff --git a/audio/libao/files/patch-Makefile.in b/audio/libao/files/patch-Makefile.in
index 909311d9f1ea..493ebf83cc0c 100644
--- a/audio/libao/files/patch-Makefile.in
+++ b/audio/libao/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig
-+++ Makefile.in
-@@ -225,7 +225,7 @@
+--- Makefile.in.orig	2007-07-14 18:06:32.000000000 -0400
++++ Makefile.in	2007-07-14 18:06:52.000000000 -0400
+@@ -225,7 +225,7 @@ target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
 -SUBDIRS = src include doc
 +SUBDIRS = src include $(DOC)
- m4datadir = $(prefix)/share/aclocal
+ m4datadir = $(datadir)/aclocal
  m4data_DATA = ao.m4
  pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 5903667ae4d7..5e0c44e8e19d 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libogg
 PORTVERSION=	1.1.3
-PORTEPOCH=	3
+PORTEPOCH=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
 
diff --git a/audio/libogg/files/patch-Makefile.in b/audio/libogg/files/patch-Makefile.in
index ad520c28e4a8..86af462c091d 100644
--- a/audio/libogg/files/patch-Makefile.in
+++ b/audio/libogg/files/patch-Makefile.in
@@ -9,6 +9,6 @@ $FreeBSD$
  AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
 -SUBDIRS = src include doc win32
 +SUBDIRS = src include $(DOC) win32
- m4datadir = $(prefix)/share/aclocal
+ m4datadir = $(datadir)/aclocal
  m4data_DATA = ogg.m4
  pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 9f739245eb1d..659016222e01 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libvorbis
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/ \
diff --git a/audio/libvorbis/files/patch-Makefile.in b/audio/libvorbis/files/patch-Makefile.in
index d6ed5acecb16..6b363dcf1a5e 100644
--- a/audio/libvorbis/files/patch-Makefile.in
+++ b/audio/libvorbis/files/patch-Makefile.in
@@ -9,6 +9,6 @@ $FreeBSD$
  AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
 -SUBDIRS = lib include doc examples vq
 +SUBDIRS = lib include $(DOC) examples vq
- m4datadir = $(prefix)/share/aclocal
+ m4datadir = $(datadir)/aclocal
  m4data_DATA = vorbis.m4
  pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 3f11bb7b6f1a..3fbab0824ffe 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	liteamp
 PORTVERSION=	0.2.3.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://kldp.net/frs/download.php/547/
 
diff --git a/audio/liteamp/pkg-plist b/audio/liteamp/pkg-plist
index 613d7b7761b0..d00cb8dc0cfa 100644
--- a/audio/liteamp/pkg-plist
+++ b/audio/liteamp/pkg-plist
@@ -1,31 +1,32 @@
 bin/liteamp
 share/locale/ko/LC_MESSAGES/liteamp.mo
-share/gnome/pixmaps/liteamp.png
-share/gnome/pixmaps/liteamp/adddir.png
-share/gnome/pixmaps/liteamp/addfile.png
-share/gnome/pixmaps/liteamp/icon-view.png
-share/gnome/pixmaps/liteamp/ladder-view.png
-share/gnome/pixmaps/liteamp/liteamp-logo.png
-share/gnome/pixmaps/liteamp/liteamp.png
-share/gnome/pixmaps/liteamp/loop.png
-share/gnome/pixmaps/liteamp/next.png
-share/gnome/pixmaps/liteamp/pause.png
-share/gnome/pixmaps/liteamp/play.png
-share/gnome/pixmaps/liteamp/playlist-all.png
-share/gnome/pixmaps/liteamp/playlist-audiocd.png
-share/gnome/pixmaps/liteamp/playlist-favorites.png
-share/gnome/pixmaps/liteamp/playlist-radio.png
-share/gnome/pixmaps/liteamp/playlist.png
-share/gnome/pixmaps/liteamp/pos.png
-share/gnome/pixmaps/liteamp/prev.png
-share/gnome/pixmaps/liteamp/seek.png
-share/gnome/pixmaps/liteamp/shuffle.png
-share/gnome/pixmaps/liteamp/start.png
-share/gnome/pixmaps/liteamp/stop.png
-share/gnome/pixmaps/liteamp/tree-view.png
-share/gnome/pixmaps/liteamp/vol.png
-share/gnome/pixmaps/liteamp/vol_down.png
-share/gnome/pixmaps/liteamp/vol_mute.png
-share/gnome/pixmaps/liteamp/vol_up.png
-share/gnome/applications/liteamp.desktop
-@dirrm share/gnome/pixmaps/liteamp
+share/pixmaps/liteamp.png
+share/pixmaps/liteamp/adddir.png
+share/pixmaps/liteamp/addfile.png
+share/pixmaps/liteamp/icon-view.png
+share/pixmaps/liteamp/ladder-view.png
+share/pixmaps/liteamp/liteamp-logo.png
+share/pixmaps/liteamp/liteamp.png
+share/pixmaps/liteamp/loop.png
+share/pixmaps/liteamp/next.png
+share/pixmaps/liteamp/pause.png
+share/pixmaps/liteamp/play.png
+share/pixmaps/liteamp/playlist-all.png
+share/pixmaps/liteamp/playlist-audiocd.png
+share/pixmaps/liteamp/playlist-favorites.png
+share/pixmaps/liteamp/playlist-radio.png
+share/pixmaps/liteamp/playlist.png
+share/pixmaps/liteamp/pos.png
+share/pixmaps/liteamp/prev.png
+share/pixmaps/liteamp/seek.png
+share/pixmaps/liteamp/shuffle.png
+share/pixmaps/liteamp/start.png
+share/pixmaps/liteamp/stop.png
+share/pixmaps/liteamp/tree-view.png
+share/pixmaps/liteamp/vol.png
+share/pixmaps/liteamp/vol_down.png
+share/pixmaps/liteamp/vol_mute.png
+share/pixmaps/liteamp/vol_up.png
+share/applications/liteamp.desktop
+@dirrm share/pixmaps/liteamp
+@dirrmtry share/applications
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 05803f7f6595..aefcbde5e386 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.56 2007/10/10 16:52:55 killfill Exp $
+#   $Id: Makefile,v 1.54 2007/01/26 03:17:25 tmclau02 Exp $
 #
 
 PORTNAME=	muine
 PORTVERSION=	0.8.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://muine-player.org/releases/
 
diff --git a/audio/muine/pkg-plist b/audio/muine/pkg-plist
index 985568794ee1..8382c7541547 100644
--- a/audio/muine/pkg-plist
+++ b/audio/muine/pkg-plist
@@ -17,7 +17,7 @@ lib/muine/plugins/TrayIcon.dll
 libdata/pkgconfig/muine-dbus.pc
 libdata/pkgconfig/muine-plugin.pc
 share/dbus-1/services/org.gnome.Muine.service
-share/gnome/applications/muine.desktop
+share/applications/muine.desktop
 share/icons/hicolor/16x16/apps/muine.png
 share/icons/hicolor/22x22/apps/muine.png
 share/icons/hicolor/24x24/apps/muine.png
@@ -68,3 +68,4 @@ share/locale/vi/LC_MESSAGES/muine.mo
 share/locale/zh_CN/LC_MESSAGES/muine.mo
 @dirrmtry lib/muine/plugins
 @dirrmtry lib/muine
+@dirrmtry share/applications
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index 5ce2d1512890..13b63958090b 100644
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Jean-Yves Lefort <jylefort@brutele.be>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/musicbox-tag-editor/Makefile,v 1.5 2007/09/10 05:13:24 mezz Exp $
 #
 
 PORTNAME=		musicbox-tag-editor
 PORTVERSION=		0.2.3
-PORTREVISION=	5
+PORTREVISION=		7
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	musicbox
@@ -27,7 +28,9 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=		--program-suffix=-tag-editor
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/share/pixmaps|${PREFIX}/share/gnome/pixmaps|' ${WRKSRC}/data/musicbox.glade
-	@${REINPLACE_CMD} -e 's|Exec=musicbox|Exec=musicbox-tag-editor|' ${WRKSRC}/data/musicbox.desktop
+	@${REINPLACE_CMD} -e 's|/usr/share/pixmaps|${PREFIX}/share/pixmaps|' \
+		${WRKSRC}/data/musicbox.glade
+	@${REINPLACE_CMD} -e 's|Exec=musicbox|Exec=musicbox-tag-editor|' \
+		${WRKSRC}/data/musicbox.desktop
 
 .include <bsd.port.mk>
diff --git a/audio/musicbox-tag-editor/pkg-plist b/audio/musicbox-tag-editor/pkg-plist
index a1562c726020..a3e377e1449d 100644
--- a/audio/musicbox-tag-editor/pkg-plist
+++ b/audio/musicbox-tag-editor/pkg-plist
@@ -1,6 +1,7 @@
 bin/musicbox-tag-editor
-share/gnome/applications/musicbox.desktop
-share/gnome/musicbox/edit.pl
-share/gnome/musicbox/musicbox.glade
-share/gnome/pixmaps/musicbox.png
-@dirrm share/gnome/musicbox
+share/applications/musicbox.desktop
+share/musicbox/edit.pl
+share/musicbox/musicbox.glade
+share/pixmaps/musicbox.png
+@dirrm share/musicbox
+@dirrmtry share/applications
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index 6aa89162e10e..6e73738e7bcf 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	paman
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/paman/
 
@@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--disable-lynx
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
 
-DATADIR=	share/gnome/${PORTNAME}
+DATADIR=	share/${PORTNAME}
 
 PLIST_FILES=	bin/paman \
 		%%DATADIR%%/paman.glade
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 5b5367e142d8..468c2e708607 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/audio/pulseaudio/Makefile,v 1.5 2006/09/10 00:51:05 mezz Exp $
+#   $MCom: ports/audio/pulseaudio/Makefile,v 1.7 2007/09/10 05:10:38 mezz Exp $
 #
 
 PORTNAME=	pulseaudio
 PORTVERSION=	0.9.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
index caa3c7a3df71..3d6c892f4b46 100644
--- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in
+++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
@@ -5,7 +5,7 @@
  
  ### Load something to the sample cache
 -load-sample x11-bell /usr/share/sounds/gtk-events/activate.wav
-+load-sample x11-bell %%LOCALBASE%%/share/gnome/sounds/gtk-events/activate.wav
++load-sample x11-bell %%LOCALBASE%%/share/sounds/gtk-events/activate.wav
  #load-sample-dir-lazy /usr/share/sounds/*.wav
  
  ### Load X11 bell module
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 2e4923f52232..5ddf729bdc7f 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.70 2007/03/07 17:00:36 adamw Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.81 2007/07/30 19:41:19 mezz Exp $
 #
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
@@ -19,7 +19,7 @@ COMMENT=	Audio player for GNOME
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem \
+		totem-plparser.7:${PORTSDIR}/multimedia/totem \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
 		soup-2.2.8:${PORTSDIR}/devel/libsoup \
@@ -38,8 +38,8 @@ CONFIGURE_ARGS=	--enable-nautilus-menu --with-playback=gstreamer-0-10
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LIBS="-lm" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 
 GCONF_SCHEMAS=	rhythmbox.schemas
 
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index 7a6bb704c3a2..8d19a9859d25 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -206,7 +206,7 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/applications/rhythmbox.desktop
+share/applications/rhythmbox.desktop
 share/gnome/help/rhythmbox/C/fdl-appendix.xml
 share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
 share/gnome/help/rhythmbox/C/figures/rb-notification-area-menu.png
@@ -307,35 +307,35 @@ share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
 share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
-share/gnome/omf/rhythmbox/rhythmbox-C.omf
-share/gnome/omf/rhythmbox/rhythmbox-el.omf
-share/gnome/omf/rhythmbox/rhythmbox-es.omf
-share/gnome/omf/rhythmbox/rhythmbox-fr.omf
-share/gnome/omf/rhythmbox/rhythmbox-ru.omf
-share/gnome/omf/rhythmbox/rhythmbox-sv.omf
-share/gnome/omf/rhythmbox/rhythmbox-zh_CN.omf
-share/gnome/rhythmbox/art/about-logo.png
-share/gnome/rhythmbox/art/media-eject.png
-share/gnome/rhythmbox/art/rhythmbox-no-star.png
-share/gnome/rhythmbox/art/rhythmbox-podcast.png
-share/gnome/rhythmbox/art/rhythmbox-set-star.png
-share/gnome/rhythmbox/art/rhythmbox-tray-icon.png
-share/gnome/rhythmbox/art/rhythmbox-unset-star.png
-share/gnome/rhythmbox/glade/create-playlist.glade
-share/gnome/rhythmbox/glade/druid.glade
-share/gnome/rhythmbox/glade/general-prefs.glade
-share/gnome/rhythmbox/glade/library-prefs.glade
-share/gnome/rhythmbox/glade/playlist-save.glade
-share/gnome/rhythmbox/glade/plugins.glade
-share/gnome/rhythmbox/glade/podcast-feed-properties.glade
-share/gnome/rhythmbox/glade/podcast-prefs.glade
-share/gnome/rhythmbox/glade/podcast-properties.glade
-share/gnome/rhythmbox/glade/song-info-multiple.glade
-share/gnome/rhythmbox/glade/song-info.glade
-share/gnome/rhythmbox/glade/uri-new.glade
-share/gnome/rhythmbox/glade/uri.glade
-share/gnome/rhythmbox/playlists.xml
-share/gnome/rhythmbox/rhythmbox-ui.xml
+share/omf/rhythmbox/rhythmbox-C.omf
+share/omf/rhythmbox/rhythmbox-el.omf
+share/omf/rhythmbox/rhythmbox-es.omf
+share/omf/rhythmbox/rhythmbox-fr.omf
+share/omf/rhythmbox/rhythmbox-ru.omf
+share/omf/rhythmbox/rhythmbox-sv.omf
+share/omf/rhythmbox/rhythmbox-zh_CN.omf
+share/rhythmbox/art/about-logo.png
+share/rhythmbox/art/media-eject.png
+share/rhythmbox/art/rhythmbox-no-star.png
+share/rhythmbox/art/rhythmbox-podcast.png
+share/rhythmbox/art/rhythmbox-set-star.png
+share/rhythmbox/art/rhythmbox-tray-icon.png
+share/rhythmbox/art/rhythmbox-unset-star.png
+share/rhythmbox/glade/create-playlist.glade
+share/rhythmbox/glade/druid.glade
+share/rhythmbox/glade/general-prefs.glade
+share/rhythmbox/glade/library-prefs.glade
+share/rhythmbox/glade/playlist-save.glade
+share/rhythmbox/glade/plugins.glade
+share/rhythmbox/glade/podcast-feed-properties.glade
+share/rhythmbox/glade/podcast-prefs.glade
+share/rhythmbox/glade/podcast-properties.glade
+share/rhythmbox/glade/song-info-multiple.glade
+share/rhythmbox/glade/song-info.glade
+share/rhythmbox/glade/uri-new.glade
+share/rhythmbox/glade/uri.glade
+share/rhythmbox/playlists.xml
+share/rhythmbox/rhythmbox-ui.xml
 share/icons/hicolor/48x48/apps/rhythmbox.png
 share/locale/am/LC_MESSAGES/rhythmbox.mo
 share/locale/ar/LC_MESSAGES/rhythmbox.mo
@@ -394,10 +394,10 @@ share/locale/vi/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
-@dirrm share/gnome/rhythmbox/glade
-@dirrm share/gnome/rhythmbox/art
-@dirrm share/gnome/rhythmbox
-@dirrm share/gnome/omf/rhythmbox
+@dirrm share/rhythmbox/glade
+@dirrm share/rhythmbox/art
+@dirrm share/rhythmbox
+@dirrm share/omf/rhythmbox
 @dirrm share/gnome/help/rhythmbox/zh_CN/figures
 @dirrm share/gnome/help/rhythmbox/zh_CN
 @dirrm share/gnome/help/rhythmbox/sv/figures
@@ -439,3 +439,4 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 2e4923f52232..5ddf729bdc7f 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.70 2007/03/07 17:00:36 adamw Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.81 2007/07/30 19:41:19 mezz Exp $
 #
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
@@ -19,7 +19,7 @@ COMMENT=	Audio player for GNOME
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem \
+		totem-plparser.7:${PORTSDIR}/multimedia/totem \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
 		soup-2.2.8:${PORTSDIR}/devel/libsoup \
@@ -38,8 +38,8 @@ CONFIGURE_ARGS=	--enable-nautilus-menu --with-playback=gstreamer-0-10
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LIBS="-lm" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 
 GCONF_SCHEMAS=	rhythmbox.schemas
 
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 7a6bb704c3a2..8d19a9859d25 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -206,7 +206,7 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/applications/rhythmbox.desktop
+share/applications/rhythmbox.desktop
 share/gnome/help/rhythmbox/C/fdl-appendix.xml
 share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
 share/gnome/help/rhythmbox/C/figures/rb-notification-area-menu.png
@@ -307,35 +307,35 @@ share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
 share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
-share/gnome/omf/rhythmbox/rhythmbox-C.omf
-share/gnome/omf/rhythmbox/rhythmbox-el.omf
-share/gnome/omf/rhythmbox/rhythmbox-es.omf
-share/gnome/omf/rhythmbox/rhythmbox-fr.omf
-share/gnome/omf/rhythmbox/rhythmbox-ru.omf
-share/gnome/omf/rhythmbox/rhythmbox-sv.omf
-share/gnome/omf/rhythmbox/rhythmbox-zh_CN.omf
-share/gnome/rhythmbox/art/about-logo.png
-share/gnome/rhythmbox/art/media-eject.png
-share/gnome/rhythmbox/art/rhythmbox-no-star.png
-share/gnome/rhythmbox/art/rhythmbox-podcast.png
-share/gnome/rhythmbox/art/rhythmbox-set-star.png
-share/gnome/rhythmbox/art/rhythmbox-tray-icon.png
-share/gnome/rhythmbox/art/rhythmbox-unset-star.png
-share/gnome/rhythmbox/glade/create-playlist.glade
-share/gnome/rhythmbox/glade/druid.glade
-share/gnome/rhythmbox/glade/general-prefs.glade
-share/gnome/rhythmbox/glade/library-prefs.glade
-share/gnome/rhythmbox/glade/playlist-save.glade
-share/gnome/rhythmbox/glade/plugins.glade
-share/gnome/rhythmbox/glade/podcast-feed-properties.glade
-share/gnome/rhythmbox/glade/podcast-prefs.glade
-share/gnome/rhythmbox/glade/podcast-properties.glade
-share/gnome/rhythmbox/glade/song-info-multiple.glade
-share/gnome/rhythmbox/glade/song-info.glade
-share/gnome/rhythmbox/glade/uri-new.glade
-share/gnome/rhythmbox/glade/uri.glade
-share/gnome/rhythmbox/playlists.xml
-share/gnome/rhythmbox/rhythmbox-ui.xml
+share/omf/rhythmbox/rhythmbox-C.omf
+share/omf/rhythmbox/rhythmbox-el.omf
+share/omf/rhythmbox/rhythmbox-es.omf
+share/omf/rhythmbox/rhythmbox-fr.omf
+share/omf/rhythmbox/rhythmbox-ru.omf
+share/omf/rhythmbox/rhythmbox-sv.omf
+share/omf/rhythmbox/rhythmbox-zh_CN.omf
+share/rhythmbox/art/about-logo.png
+share/rhythmbox/art/media-eject.png
+share/rhythmbox/art/rhythmbox-no-star.png
+share/rhythmbox/art/rhythmbox-podcast.png
+share/rhythmbox/art/rhythmbox-set-star.png
+share/rhythmbox/art/rhythmbox-tray-icon.png
+share/rhythmbox/art/rhythmbox-unset-star.png
+share/rhythmbox/glade/create-playlist.glade
+share/rhythmbox/glade/druid.glade
+share/rhythmbox/glade/general-prefs.glade
+share/rhythmbox/glade/library-prefs.glade
+share/rhythmbox/glade/playlist-save.glade
+share/rhythmbox/glade/plugins.glade
+share/rhythmbox/glade/podcast-feed-properties.glade
+share/rhythmbox/glade/podcast-prefs.glade
+share/rhythmbox/glade/podcast-properties.glade
+share/rhythmbox/glade/song-info-multiple.glade
+share/rhythmbox/glade/song-info.glade
+share/rhythmbox/glade/uri-new.glade
+share/rhythmbox/glade/uri.glade
+share/rhythmbox/playlists.xml
+share/rhythmbox/rhythmbox-ui.xml
 share/icons/hicolor/48x48/apps/rhythmbox.png
 share/locale/am/LC_MESSAGES/rhythmbox.mo
 share/locale/ar/LC_MESSAGES/rhythmbox.mo
@@ -394,10 +394,10 @@ share/locale/vi/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
-@dirrm share/gnome/rhythmbox/glade
-@dirrm share/gnome/rhythmbox/art
-@dirrm share/gnome/rhythmbox
-@dirrm share/gnome/omf/rhythmbox
+@dirrm share/rhythmbox/glade
+@dirrm share/rhythmbox/art
+@dirrm share/rhythmbox
+@dirrm share/omf/rhythmbox
 @dirrm share/gnome/help/rhythmbox/zh_CN/figures
 @dirrm share/gnome/help/rhythmbox/zh_CN
 @dirrm share/gnome/help/rhythmbox/sv/figures
@@ -439,3 +439,4 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 2567962282f2..fa046b52df6d 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -4,10 +4,12 @@
 # Whom:				ijliao
 #
 # $FreeBSD$
+#   $MCom: ports/audio/solfege/Makefile,v 1.7 2007/09/09 23:47:50 mezz Exp $
 #
 
 PORTNAME=	solfege
 PORTVERSION=	3.9.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-nosound
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index 9e4a37f35d14..60f47c9e9a35 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -1,904 +1,904 @@
 bin/lessonfile_editor
 bin/solfege
 etc/solfege
-share/gnome/applications/solfege.desktop
-share/gnome/pixmaps/solfege.png
-share/gnome/solfege/debugtree.txt
-share/gnome/solfege/default.config
-share/gnome/solfege/example-lesson-files/chord-satb
-share/gnome/solfege/example-lesson-files/example-1
-share/gnome/solfege/example-lesson-files/harmonic-progression-dictation
-share/gnome/solfege/example-lesson-files/id-by-name-1
-share/gnome/solfege/example-lesson-files/id-by-name-2
-share/gnome/solfege/example-lesson-files/learn-min-major-1
-share/gnome/solfege/example-lesson-files/learn-min-major-2
-share/gnome/solfege/example-lesson-files/learn-min-major-3
-share/gnome/solfege/example-lesson-files/sing-chord
-share/gnome/solfege/example-lesson-files/very-easy-scale
-share/gnome/solfege/example-lesson-files/very-easy-scale2
-share/gnome/solfege/feta/feta20-accidentals--1.xpm
-share/gnome/solfege/feta/feta20-accidentals--2.xpm
-share/gnome/solfege/feta/feta20-accidentals-0.xpm
-share/gnome/solfege/feta/feta20-accidentals-1.xpm
-share/gnome/solfege/feta/feta20-accidentals-2.xpm
-share/gnome/solfege/feta/feta20-clefs-C.xpm
-share/gnome/solfege/feta/feta20-clefs-F.xpm
-share/gnome/solfege/feta/feta20-clefs-G.xpm
-share/gnome/solfege/feta/feta20-dots-dot.xpm
-share/gnome/solfege/feta/feta20-flags-d3.xpm
-share/gnome/solfege/feta/feta20-flags-d4.xpm
-share/gnome/solfege/feta/feta20-flags-d5.xpm
-share/gnome/solfege/feta/feta20-flags-d6.xpm
-share/gnome/solfege/feta/feta20-flags-u3.xpm
-share/gnome/solfege/feta/feta20-flags-u4.xpm
-share/gnome/solfege/feta/feta20-flags-u5.xpm
-share/gnome/solfege/feta/feta20-flags-u6.xpm
-share/gnome/solfege/feta/feta20-noteheads-0.xpm
-share/gnome/solfege/feta/feta20-noteheads-1.xpm
-share/gnome/solfege/feta/feta20-noteheads-2.xpm
-share/gnome/solfege/feta/feta20-number-0.xpm
-share/gnome/solfege/feta/feta20-number-1.xpm
-share/gnome/solfege/feta/feta20-number-2.xpm
-share/gnome/solfege/feta/feta20-number-3.xpm
-share/gnome/solfege/feta/feta20-number-4.xpm
-share/gnome/solfege/feta/feta20-number-5.xpm
-share/gnome/solfege/feta/feta20-number-6.xpm
-share/gnome/solfege/feta/feta20-number-7.xpm
-share/gnome/solfege/feta/feta20-number-8.xpm
-share/gnome/solfege/feta/feta20-number-9.xpm
-share/gnome/solfege/feta/feta20-rests--1.xpm
-share/gnome/solfege/feta/feta20-rests--2.xpm
-share/gnome/solfege/feta/feta20-rests--4.xpm
-share/gnome/solfege/feta/feta20-rests-0.xpm
-share/gnome/solfege/feta/feta20-rests-0o.xpm
-share/gnome/solfege/feta/feta20-rests-1.xpm
-share/gnome/solfege/feta/feta20-rests-1o.xpm
-share/gnome/solfege/feta/feta20-rests-2.xpm
-share/gnome/solfege/feta/feta20-rests-3.xpm
-share/gnome/solfege/feta/feta20-rests-4.xpm
-share/gnome/solfege/feta/feta20-rests-5.xpm
-share/gnome/solfege/feta/feta20-rests-6.xpm
-share/gnome/solfege/feta/feta20-rests-7.xpm
-share/gnome/solfege/graphics/chord-voicing.png
-share/gnome/solfege/graphics/chord.png
-share/gnome/solfege/graphics/compare-intervals.png
-share/gnome/solfege/graphics/dictation.png
-share/gnome/solfege/graphics/double-flat.png
-share/gnome/solfege/graphics/double-flat.svg
-share/gnome/solfege/graphics/double-sharp.png
-share/gnome/solfege/graphics/double-sharp.svg
-share/gnome/solfege/graphics/erase.png
-share/gnome/solfege/graphics/erase.svg
-share/gnome/solfege/graphics/flat.png
-share/gnome/solfege/graphics/flat.svg
-share/gnome/solfege/graphics/happyface.png
-share/gnome/solfege/graphics/harmonic-interval.png
-share/gnome/solfege/graphics/harmonic-progression-dictation.png
-share/gnome/solfege/graphics/holder.png
-share/gnome/solfege/graphics/id-by-name.png
-share/gnome/solfege/graphics/id-tone.png
-share/gnome/solfege/graphics/identify-bpm.png
-share/gnome/solfege/graphics/identify-chord.png
-share/gnome/solfege/graphics/identify-scale.png
-share/gnome/solfege/graphics/image-not-found.png
-share/gnome/solfege/graphics/melodic-interval.png
-share/gnome/solfege/graphics/natural.png
-share/gnome/solfege/graphics/natural.svg
-share/gnome/solfege/graphics/notehead.png
-share/gnome/solfege/graphics/notehead.svg
-share/gnome/solfege/graphics/rhythm-c12c12c12.png
-share/gnome/solfege/graphics/rhythm-c12c12r12.png
-share/gnome/solfege/graphics/rhythm-c12r12c12.png
-share/gnome/solfege/graphics/rhythm-c16c16c16c16.png
-share/gnome/solfege/graphics/rhythm-c16c16c16c16c16c16.png
-share/gnome/solfege/graphics/rhythm-c16c16c16c16c8.png
-share/gnome/solfege/graphics/rhythm-c16c16c4.png
-share/gnome/solfege/graphics/rhythm-c16c16c8.png
-share/gnome/solfege/graphics/rhythm-c16c16c8c16c16.png
-share/gnome/solfege/graphics/rhythm-c16c16c8c8.png
-share/gnome/solfege/graphics/rhythm-c16c8..png
-share/gnome/solfege/graphics/rhythm-c16c8c16.png
-share/gnome/solfege/graphics/rhythm-c4..png
-share/gnome/solfege/graphics/rhythm-c4.png
-share/gnome/solfege/graphics/rhythm-c4c16c16.png
-share/gnome/solfege/graphics/rhythm-c4c8.png
-share/gnome/solfege/graphics/rhythm-c8.c16.png
-share/gnome/solfege/graphics/rhythm-c8c16c16.png
-share/gnome/solfege/graphics/rhythm-c8c16c16c16c16.png
-share/gnome/solfege/graphics/rhythm-c8c16c16c8.png
-share/gnome/solfege/graphics/rhythm-c8c4.png
-share/gnome/solfege/graphics/rhythm-c8c8.png
-share/gnome/solfege/graphics/rhythm-c8c8c16c16.png
-share/gnome/solfege/graphics/rhythm-c8c8c8.png
-share/gnome/solfege/graphics/rhythm-r12c12c12.png
-share/gnome/solfege/graphics/rhythm-r12c12r12.png
-share/gnome/solfege/graphics/rhythm-r12r12c12.png
-share/gnome/solfege/graphics/rhythm-r16c16c16c16.png
-share/gnome/solfege/graphics/rhythm-r16c16c8.png
-share/gnome/solfege/graphics/rhythm-r16c8..png
-share/gnome/solfege/graphics/rhythm-r16c8c16.png
-share/gnome/solfege/graphics/rhythm-r4.png
-share/gnome/solfege/graphics/rhythm-r8c16c16.png
-share/gnome/solfege/graphics/rhythm-r8c8.png
-share/gnome/solfege/graphics/rhythm-r8r16c16.png
-share/gnome/solfege/graphics/rhythm-wrong.png
-share/gnome/solfege/graphics/rhythm.png
-share/gnome/solfege/graphics/sadface.png
-share/gnome/solfege/graphics/sharp.png
-share/gnome/solfege/graphics/sharp.svg
-share/gnome/solfege/graphics/sing-chord.png
-share/gnome/solfege/graphics/sing-interval.png
-share/gnome/solfege/graphics/solfege.png
-share/gnome/solfege/graphics/solfege.svg
-share/gnome/solfege/graphics/solfege.xpm
-share/gnome/solfege/graphics/test-sound.png
-share/gnome/solfege/graphics/twelve-tone.png
-share/gnome/solfege/help-menu.xml
-share/gnome/solfege/help/C/apb.html
-share/gnome/solfege/help/C/bug-reporting.html
-share/gnome/solfege/help/C/chord-module.html
-share/gnome/solfege/help/C/chord.html
-share/gnome/solfege/help/C/compareintervals-module.html
-share/gnome/solfege/help/C/dictation-module.html
-share/gnome/solfege/help/C/dictation.html
-share/gnome/solfege/help/C/ear-training-test-printout-editor.html
-share/gnome/solfege/help/C/elembuilder-module.html
-share/gnome/solfege/help/C/elembuilder.html
-share/gnome/solfege/help/C/extending-solfege.html
-share/gnome/solfege/help/C/figures/chord.png
-share/gnome/solfege/help/C/figures/dictation.png
-share/gnome/solfege/help/C/figures/elembuilder-harmonic-progressions.png
-share/gnome/solfege/help/C/figures/id-interval-buttons-thirds.png
-share/gnome/solfege/help/C/figures/id-interval-piano.png
-share/gnome/solfege/help/C/figures/idbyname-chords.png
-share/gnome/solfege/help/C/figures/idbyname-intonation.png
-share/gnome/solfege/help/C/figures/identifybpm.png
-share/gnome/solfege/help/C/figures/idtone.png
-share/gnome/solfege/help/C/figures/nameinterval.png
-share/gnome/solfege/help/C/figures/preferences-gui.png
-share/gnome/solfege/help/C/figures/preferences-midi.png
-share/gnome/solfege/help/C/figures/preferences-practise.png
-share/gnome/solfege/help/C/figures/preferences-sound-setup.png
-share/gnome/solfege/help/C/figures/preferences-user.png
-share/gnome/solfege/help/C/figures/rhythm.png
-share/gnome/solfege/help/C/figures/singchord.png
-share/gnome/solfege/help/C/figures/singinterval.png
-share/gnome/solfege/help/C/figures/trainingset-editor.png
-share/gnome/solfege/help/C/figures/twelvetone.png
-share/gnome/solfege/help/C/gpl-2.html
-share/gnome/solfege/help/C/gpl-3.html
-share/gnome/solfege/help/C/gpl.html
-share/gnome/solfege/help/C/harmonicinterval-module.html
-share/gnome/solfege/help/C/harmonicinterval.html
-share/gnome/solfege/help/C/idbyname-chords.html
-share/gnome/solfege/help/C/idbyname-intonation.html
-share/gnome/solfege/help/C/idbyname-module.html
-share/gnome/solfege/help/C/identifybpm.html
-share/gnome/solfege/help/C/idtone-module.html
-share/gnome/solfege/help/C/idtone.html
-share/gnome/solfege/help/C/index.html
-share/gnome/solfege/help/C/inverting-intervals.html
-share/gnome/solfege/help/C/lesson-files.html
-share/gnome/solfege/help/C/ly/inverting-intervals.png
-share/gnome/solfege/help/C/ly/theory-intervals-1.png
-share/gnome/solfege/help/C/ly/theory-intervals-fifths-1.png
-share/gnome/solfege/help/C/ly/theory-intervals-fifths-2.png
-share/gnome/solfege/help/C/ly/theory-intervals-fifths.png
-share/gnome/solfege/help/C/ly/theory-intervals-fourths.png
-share/gnome/solfege/help/C/ly/theory-intervals-seconds-1.png
-share/gnome/solfege/help/C/ly/theory-intervals-seconds-2.png
-share/gnome/solfege/help/C/ly/theory-intervals-seconds-3.png
-share/gnome/solfege/help/C/ly/theory-intervals-seconds.png
-share/gnome/solfege/help/C/ly/theory-intervals-sevenths.png
-share/gnome/solfege/help/C/ly/theory-intervals-sixths.png
-share/gnome/solfege/help/C/ly/theory-intervals-thirds.png
-share/gnome/solfege/help/C/melodicinterval-module.html
-share/gnome/solfege/help/C/melodicinterval.html
-share/gnome/solfege/help/C/midi-instrument-names.html
-share/gnome/solfege/help/C/music-theory.html
-share/gnome/solfege/help/C/nameinterval-module.html
-share/gnome/solfege/help/C/nameinterval.html
-share/gnome/solfege/help/C/online-resources.html
-share/gnome/solfege/help/C/preferences-window.html
-share/gnome/solfege/help/C/rhythm-module.html
-share/gnome/solfege/help/C/rhythm.html
-share/gnome/solfege/help/C/rhythmtapping-module.html
-share/gnome/solfege/help/C/rhythmtapping2-module.html
-share/gnome/solfege/help/C/rhythmtapping2.html
-share/gnome/solfege/help/C/scales.html
-share/gnome/solfege/help/C/singanswer-module.html
-share/gnome/solfege/help/C/singchord-module.html
-share/gnome/solfege/help/C/singchord.html
-share/gnome/solfege/help/C/singinterval-module.html
-share/gnome/solfege/help/C/singinterval.html
-share/gnome/solfege/help/C/solfege-exercise-helps.html
-share/gnome/solfege/help/C/solfege-intro.html
-share/gnome/solfege/help/C/theory-intervals.html
-share/gnome/solfege/help/C/trainingset-editor.html
-share/gnome/solfege/help/C/twelvetone.html
-share/gnome/solfege/help/C/welcome.html
-share/gnome/solfege/help/fr/apb.html
-share/gnome/solfege/help/fr/bug-reporting.html
-share/gnome/solfege/help/fr/chord-module.html
-share/gnome/solfege/help/fr/chord.html
-share/gnome/solfege/help/fr/compareintervals-module.html
-share/gnome/solfege/help/fr/dictation-module.html
-share/gnome/solfege/help/fr/dictation.html
-share/gnome/solfege/help/fr/ear-training-test-printout-editor.html
-share/gnome/solfege/help/fr/elembuilder-module.html
-share/gnome/solfege/help/fr/elembuilder.html
-share/gnome/solfege/help/fr/extending-solfege.html
-share/gnome/solfege/help/fr/figures/chord.png
-share/gnome/solfege/help/fr/figures/dictation.png
-share/gnome/solfege/help/fr/figures/id-interval-buttons-thirds.png
-share/gnome/solfege/help/fr/figures/id-interval-piano.png
-share/gnome/solfege/help/fr/figures/idbyname-chords.png
-share/gnome/solfege/help/fr/figures/idbyname-intonation.png
-share/gnome/solfege/help/fr/figures/identifybpm.png
-share/gnome/solfege/help/fr/figures/idtone.png
-share/gnome/solfege/help/fr/figures/preferences-gui.png
-share/gnome/solfege/help/fr/figures/preferences-midi.png
-share/gnome/solfege/help/fr/figures/preferences-practise.png
-share/gnome/solfege/help/fr/figures/preferences-sound-setup.png
-share/gnome/solfege/help/fr/figures/preferences-user.png
-share/gnome/solfege/help/fr/figures/rhythm.png
-share/gnome/solfege/help/fr/figures/singchord.png
-share/gnome/solfege/help/fr/figures/singinterval.png
-share/gnome/solfege/help/fr/figures/twelvetone.png
-share/gnome/solfege/help/fr/gpl-2.html
-share/gnome/solfege/help/fr/gpl-3.html
-share/gnome/solfege/help/fr/gpl.html
-share/gnome/solfege/help/fr/harmonicinterval-module.html
-share/gnome/solfege/help/fr/harmonicinterval.html
-share/gnome/solfege/help/fr/idbyname-chords.html
-share/gnome/solfege/help/fr/idbyname-intonation.html
-share/gnome/solfege/help/fr/idbyname-module.html
-share/gnome/solfege/help/fr/identifybpm.html
-share/gnome/solfege/help/fr/idtone-module.html
-share/gnome/solfege/help/fr/idtone.html
-share/gnome/solfege/help/fr/index.html
-share/gnome/solfege/help/fr/inverting-intervals.html
-share/gnome/solfege/help/fr/lesson-files.html
-share/gnome/solfege/help/fr/melodicinterval-module.html
-share/gnome/solfege/help/fr/melodicinterval.html
-share/gnome/solfege/help/fr/midi-instrument-names.html
-share/gnome/solfege/help/fr/music-theory.html
-share/gnome/solfege/help/fr/nameinterval-module.html
-share/gnome/solfege/help/fr/nameinterval.html
-share/gnome/solfege/help/fr/online-resources.html
-share/gnome/solfege/help/fr/preferences-window.html
-share/gnome/solfege/help/fr/rhythm-module.html
-share/gnome/solfege/help/fr/rhythm.html
-share/gnome/solfege/help/fr/rhythmtapping-module.html
-share/gnome/solfege/help/fr/rhythmtapping2-module.html
-share/gnome/solfege/help/fr/rhythmtapping2.html
-share/gnome/solfege/help/fr/scales.html
-share/gnome/solfege/help/fr/singanswer-module.html
-share/gnome/solfege/help/fr/singchord-module.html
-share/gnome/solfege/help/fr/singchord.html
-share/gnome/solfege/help/fr/singinterval-module.html
-share/gnome/solfege/help/fr/singinterval.html
-share/gnome/solfege/help/fr/solfege-exercise-helps.html
-share/gnome/solfege/help/fr/solfege-intro.html
-share/gnome/solfege/help/fr/theory-intervals.html
-share/gnome/solfege/help/fr/trainingset-editor.html
-share/gnome/solfege/help/fr/twelvetone.html
-share/gnome/solfege/help/fr/welcome.html
-share/gnome/solfege/help/no/apb.html
-share/gnome/solfege/help/no/bug-reporting.html
-share/gnome/solfege/help/no/chord-module.html
-share/gnome/solfege/help/no/chord.html
-share/gnome/solfege/help/no/compareintervals-module.html
-share/gnome/solfege/help/no/dictation-module.html
-share/gnome/solfege/help/no/dictation.html
-share/gnome/solfege/help/no/ear-training-test-printout-editor.html
-share/gnome/solfege/help/no/elembuilder-module.html
-share/gnome/solfege/help/no/elembuilder.html
-share/gnome/solfege/help/no/extending-solfege.html
-share/gnome/solfege/help/no/figures/chord.png
-share/gnome/solfege/help/no/figures/dictation.png
-share/gnome/solfege/help/no/figures/id-interval-buttons-thirds.png
-share/gnome/solfege/help/no/figures/id-interval-piano.png
-share/gnome/solfege/help/no/figures/idbyname-chords.png
-share/gnome/solfege/help/no/figures/idbyname-intonation.png
-share/gnome/solfege/help/no/figures/identifybpm.png
-share/gnome/solfege/help/no/figures/idtone.png
-share/gnome/solfege/help/no/figures/preferences-gui.png
-share/gnome/solfege/help/no/figures/preferences-midi.png
-share/gnome/solfege/help/no/figures/preferences-practise.png
-share/gnome/solfege/help/no/figures/preferences-sound-setup.png
-share/gnome/solfege/help/no/figures/preferences-user.png
-share/gnome/solfege/help/no/figures/rhythm.png
-share/gnome/solfege/help/no/figures/singchord.png
-share/gnome/solfege/help/no/figures/singinterval.png
-share/gnome/solfege/help/no/figures/twelvetone.png
-share/gnome/solfege/help/no/gpl-2.html
-share/gnome/solfege/help/no/gpl-3.html
-share/gnome/solfege/help/no/gpl.html
-share/gnome/solfege/help/no/harmonicinterval-module.html
-share/gnome/solfege/help/no/harmonicinterval.html
-share/gnome/solfege/help/no/idbyname-chords.html
-share/gnome/solfege/help/no/idbyname-intonation.html
-share/gnome/solfege/help/no/idbyname-module.html
-share/gnome/solfege/help/no/identifybpm.html
-share/gnome/solfege/help/no/idtone-module.html
-share/gnome/solfege/help/no/idtone.html
-share/gnome/solfege/help/no/index.html
-share/gnome/solfege/help/no/inverting-intervals.html
-share/gnome/solfege/help/no/lesson-files.html
-share/gnome/solfege/help/no/melodicinterval-module.html
-share/gnome/solfege/help/no/melodicinterval.html
-share/gnome/solfege/help/no/midi-instrument-names.html
-share/gnome/solfege/help/no/music-theory.html
-share/gnome/solfege/help/no/nameinterval-module.html
-share/gnome/solfege/help/no/nameinterval.html
-share/gnome/solfege/help/no/online-resources.html
-share/gnome/solfege/help/no/preferences-window.html
-share/gnome/solfege/help/no/rhythm-module.html
-share/gnome/solfege/help/no/rhythm.html
-share/gnome/solfege/help/no/rhythmtapping-module.html
-share/gnome/solfege/help/no/rhythmtapping2-module.html
-share/gnome/solfege/help/no/rhythmtapping2.html
-share/gnome/solfege/help/no/scales.html
-share/gnome/solfege/help/no/singanswer-module.html
-share/gnome/solfege/help/no/singchord-module.html
-share/gnome/solfege/help/no/singchord.html
-share/gnome/solfege/help/no/singinterval-module.html
-share/gnome/solfege/help/no/singinterval.html
-share/gnome/solfege/help/no/solfege-exercise-helps.html
-share/gnome/solfege/help/no/solfege-intro.html
-share/gnome/solfege/help/no/theory-intervals.html
-share/gnome/solfege/help/no/trainingset-editor.html
-share/gnome/solfege/help/no/twelvetone.html
-share/gnome/solfege/help/no/welcome.html
-share/gnome/solfege/help/pt_BR/apb.html
-share/gnome/solfege/help/pt_BR/bug-reporting.html
-share/gnome/solfege/help/pt_BR/chord-module.html
-share/gnome/solfege/help/pt_BR/chord.html
-share/gnome/solfege/help/pt_BR/compareintervals-module.html
-share/gnome/solfege/help/pt_BR/dictation-module.html
-share/gnome/solfege/help/pt_BR/dictation.html
-share/gnome/solfege/help/pt_BR/ear-training-test-printout-editor.html
-share/gnome/solfege/help/pt_BR/elembuilder-module.html
-share/gnome/solfege/help/pt_BR/elembuilder.html
-share/gnome/solfege/help/pt_BR/extending-solfege.html
-share/gnome/solfege/help/pt_BR/figures/chord.png
-share/gnome/solfege/help/pt_BR/figures/dictation.png
-share/gnome/solfege/help/pt_BR/figures/id-interval-buttons-thirds.png
-share/gnome/solfege/help/pt_BR/figures/id-interval-piano.png
-share/gnome/solfege/help/pt_BR/figures/idbyname-chords.png
-share/gnome/solfege/help/pt_BR/figures/identifybpm.png
-share/gnome/solfege/help/pt_BR/figures/idtone.png
-share/gnome/solfege/help/pt_BR/figures/preferences-gui.png
-share/gnome/solfege/help/pt_BR/figures/preferences-midi.png
-share/gnome/solfege/help/pt_BR/figures/preferences-practise.png
-share/gnome/solfege/help/pt_BR/figures/preferences-sound-setup.png
-share/gnome/solfege/help/pt_BR/figures/preferences-user.png
-share/gnome/solfege/help/pt_BR/figures/rhythm.png
-share/gnome/solfege/help/pt_BR/figures/singchord.png
-share/gnome/solfege/help/pt_BR/figures/singinterval.png
-share/gnome/solfege/help/pt_BR/figures/twelvetone.png
-share/gnome/solfege/help/pt_BR/gpl-2.html
-share/gnome/solfege/help/pt_BR/gpl-3.html
-share/gnome/solfege/help/pt_BR/gpl.html
-share/gnome/solfege/help/pt_BR/harmonicinterval-module.html
-share/gnome/solfege/help/pt_BR/harmonicinterval.html
-share/gnome/solfege/help/pt_BR/idbyname-chords.html
-share/gnome/solfege/help/pt_BR/idbyname-intonation.html
-share/gnome/solfege/help/pt_BR/idbyname-module.html
-share/gnome/solfege/help/pt_BR/identifybpm.html
-share/gnome/solfege/help/pt_BR/idtone-module.html
-share/gnome/solfege/help/pt_BR/idtone.html
-share/gnome/solfege/help/pt_BR/index.html
-share/gnome/solfege/help/pt_BR/inverting-intervals.html
-share/gnome/solfege/help/pt_BR/lesson-files.html
-share/gnome/solfege/help/pt_BR/melodicinterval-module.html
-share/gnome/solfege/help/pt_BR/melodicinterval.html
-share/gnome/solfege/help/pt_BR/midi-instrument-names.html
-share/gnome/solfege/help/pt_BR/music-theory.html
-share/gnome/solfege/help/pt_BR/nameinterval-module.html
-share/gnome/solfege/help/pt_BR/nameinterval.html
-share/gnome/solfege/help/pt_BR/online-resources.html
-share/gnome/solfege/help/pt_BR/preferences-window.html
-share/gnome/solfege/help/pt_BR/rhythm-module.html
-share/gnome/solfege/help/pt_BR/rhythm.html
-share/gnome/solfege/help/pt_BR/rhythmtapping-module.html
-share/gnome/solfege/help/pt_BR/rhythmtapping2-module.html
-share/gnome/solfege/help/pt_BR/rhythmtapping2.html
-share/gnome/solfege/help/pt_BR/scales.html
-share/gnome/solfege/help/pt_BR/singanswer-module.html
-share/gnome/solfege/help/pt_BR/singchord-module.html
-share/gnome/solfege/help/pt_BR/singchord.html
-share/gnome/solfege/help/pt_BR/singinterval-module.html
-share/gnome/solfege/help/pt_BR/singinterval.html
-share/gnome/solfege/help/pt_BR/solfege-exercise-helps.html
-share/gnome/solfege/help/pt_BR/solfege-intro.html
-share/gnome/solfege/help/pt_BR/theory-intervals.html
-share/gnome/solfege/help/pt_BR/trainingset-editor.html
-share/gnome/solfege/help/pt_BR/twelvetone.html
-share/gnome/solfege/help/pt_BR/welcome.html
-share/gnome/solfege/help/tr/apb.html
-share/gnome/solfege/help/tr/bug-reporting.html
-share/gnome/solfege/help/tr/chord-module.html
-share/gnome/solfege/help/tr/chord.html
-share/gnome/solfege/help/tr/compareintervals-module.html
-share/gnome/solfege/help/tr/dictation-module.html
-share/gnome/solfege/help/tr/dictation.html
-share/gnome/solfege/help/tr/ear-training-test-printout-editor.html
-share/gnome/solfege/help/tr/elembuilder-module.html
-share/gnome/solfege/help/tr/elembuilder.html
-share/gnome/solfege/help/tr/extending-solfege.html
-share/gnome/solfege/help/tr/figures/chord.png
-share/gnome/solfege/help/tr/figures/dictation.png
-share/gnome/solfege/help/tr/figures/id-interval-buttons-thirds.png
-share/gnome/solfege/help/tr/figures/id-interval-piano.png
-share/gnome/solfege/help/tr/figures/idbyname-chords.png
-share/gnome/solfege/help/tr/figures/idbyname-intonation.png
-share/gnome/solfege/help/tr/figures/identifybpm.png
-share/gnome/solfege/help/tr/figures/idtone.png
-share/gnome/solfege/help/tr/figures/preferences-gui.png
-share/gnome/solfege/help/tr/figures/preferences-midi.png
-share/gnome/solfege/help/tr/figures/preferences-practise.png
-share/gnome/solfege/help/tr/figures/preferences-sound-setup.png
-share/gnome/solfege/help/tr/figures/preferences-user.png
-share/gnome/solfege/help/tr/figures/rhythm.png
-share/gnome/solfege/help/tr/figures/singchord.png
-share/gnome/solfege/help/tr/figures/singinterval.png
-share/gnome/solfege/help/tr/figures/twelvetone.png
-share/gnome/solfege/help/tr/gpl-2.html
-share/gnome/solfege/help/tr/gpl-3.html
-share/gnome/solfege/help/tr/gpl.html
-share/gnome/solfege/help/tr/harmonicinterval-module.html
-share/gnome/solfege/help/tr/harmonicinterval.html
-share/gnome/solfege/help/tr/idbyname-chords.html
-share/gnome/solfege/help/tr/idbyname-intonation.html
-share/gnome/solfege/help/tr/idbyname-module.html
-share/gnome/solfege/help/tr/identifybpm.html
-share/gnome/solfege/help/tr/idtone-module.html
-share/gnome/solfege/help/tr/idtone.html
-share/gnome/solfege/help/tr/index.html
-share/gnome/solfege/help/tr/inverting-intervals.html
-share/gnome/solfege/help/tr/lesson-files.html
-share/gnome/solfege/help/tr/melodicinterval-module.html
-share/gnome/solfege/help/tr/melodicinterval.html
-share/gnome/solfege/help/tr/midi-instrument-names.html
-share/gnome/solfege/help/tr/music-theory.html
-share/gnome/solfege/help/tr/nameinterval-module.html
-share/gnome/solfege/help/tr/nameinterval.html
-share/gnome/solfege/help/tr/online-resources.html
-share/gnome/solfege/help/tr/preferences-window.html
-share/gnome/solfege/help/tr/rhythm-module.html
-share/gnome/solfege/help/tr/rhythm.html
-share/gnome/solfege/help/tr/rhythmtapping-module.html
-share/gnome/solfege/help/tr/rhythmtapping2-module.html
-share/gnome/solfege/help/tr/rhythmtapping2.html
-share/gnome/solfege/help/tr/scales.html
-share/gnome/solfege/help/tr/singanswer-module.html
-share/gnome/solfege/help/tr/singchord-module.html
-share/gnome/solfege/help/tr/singchord.html
-share/gnome/solfege/help/tr/singinterval-module.html
-share/gnome/solfege/help/tr/singinterval.html
-share/gnome/solfege/help/tr/solfege-exercise-helps.html
-share/gnome/solfege/help/tr/solfege-intro.html
-share/gnome/solfege/help/tr/theory-intervals.html
-share/gnome/solfege/help/tr/trainingset-editor.html
-share/gnome/solfege/help/tr/twelvetone.html
-share/gnome/solfege/help/tr/welcome.html
-share/gnome/solfege/helpbrowser.xml
-share/gnome/solfege/learningtree.txt
-share/gnome/solfege/lesson-files/altered-1
-share/gnome/solfege/lesson-files/altered-2
-share/gnome/solfege/lesson-files/barnesanger
-share/gnome/solfege/lesson-files/besifring
-share/gnome/solfege/lesson-files/bin/csound-play-harmonic-interval.sh
-share/gnome/solfege/lesson-files/bpm
-share/gnome/solfege/lesson-files/chord-7b9-maj79
-share/gnome/solfege/lesson-files/chord-all
-share/gnome/solfege/lesson-files/chord-all-inv
-share/gnome/solfege/lesson-files/chord-dim-aug
-share/gnome/solfege/lesson-files/chord-dim-aug-min-major
-share/gnome/solfege/lesson-files/chord-m7-7
-share/gnome/solfege/lesson-files/chord-m7-7-inv
-share/gnome/solfege/lesson-files/chord-m7-7-inv-not
-share/gnome/solfege/lesson-files/chord-m7-7-maj7-m7b5-dim7
-share/gnome/solfege/lesson-files/chord-m9-9
-share/gnome/solfege/lesson-files/chord-m9-9-7b9-maj79
-share/gnome/solfege/lesson-files/chord-maj7-m7b5-dim7
-share/gnome/solfege/lesson-files/chord-min-major
-share/gnome/solfege/lesson-files/chord-min-major-7
-share/gnome/solfege/lesson-files/chord-min-major-close-open
-share/gnome/solfege/lesson-files/chord-min-major-inv
-share/gnome/solfege/lesson-files/chord-min-major-inv-not
-share/gnome/solfege/lesson-files/chord-voicing-test
-share/gnome/solfege/lesson-files/compare-intervals
-share/gnome/solfege/lesson-files/compare-intervals-harmonic
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-10
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-2
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-2-3
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-3
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-4-5
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-4-5-8
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-6
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-6-7
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-7
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-7-9
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-9
-share/gnome/solfege/lesson-files/compare-intervals-harmonic-tritonus-7
-share/gnome/solfege/lesson-files/csound-fifth-0.97
-share/gnome/solfege/lesson-files/csound-fifth-0.98
-share/gnome/solfege/lesson-files/csound-fifth-0.99
-share/gnome/solfege/lesson-files/csound-fifth-0.995
-share/gnome/solfege/lesson-files/csound-fifth-0.996
-share/gnome/solfege/lesson-files/csound-fifth-0.997
-share/gnome/solfege/lesson-files/csound-fifth-0.998
-share/gnome/solfege/lesson-files/diatonic-1
-share/gnome/solfege/lesson-files/diatonic-2
-share/gnome/solfege/lesson-files/durmoll
-share/gnome/solfege/lesson-files/fifth-small-pure-0.99
-share/gnome/solfege/lesson-files/harmonic-intervals
-share/gnome/solfege/lesson-files/harmonic-intervals-10
-share/gnome/solfege/lesson-files/harmonic-intervals-2
-share/gnome/solfege/lesson-files/harmonic-intervals-2-3
-share/gnome/solfege/lesson-files/harmonic-intervals-2-to-8
-share/gnome/solfege/lesson-files/harmonic-intervals-3
-share/gnome/solfege/lesson-files/harmonic-intervals-4-5
-share/gnome/solfege/lesson-files/harmonic-intervals-4-5-8
-share/gnome/solfege/lesson-files/harmonic-intervals-6
-share/gnome/solfege/lesson-files/harmonic-intervals-6-7
-share/gnome/solfege/lesson-files/harmonic-intervals-7
-share/gnome/solfege/lesson-files/harmonic-intervals-7-9
-share/gnome/solfege/lesson-files/harmonic-intervals-9
-share/gnome/solfege/lesson-files/harmonic-intervals-self-config
-share/gnome/solfege/lesson-files/harmonic-intervals-tritonus-7
-share/gnome/solfege/lesson-files/id-tone
-share/gnome/solfege/lesson-files/id-tone-cde-10
-share/gnome/solfege/lesson-files/id-tone-cde-11
-share/gnome/solfege/lesson-files/id-tone-cde-12
-share/gnome/solfege/lesson-files/id-tone-cde-3
-share/gnome/solfege/lesson-files/id-tone-cde-4
-share/gnome/solfege/lesson-files/id-tone-cde-5
-share/gnome/solfege/lesson-files/id-tone-cde-6
-share/gnome/solfege/lesson-files/id-tone-cde-7
-share/gnome/solfege/lesson-files/id-tone-cde-8
-share/gnome/solfege/lesson-files/id-tone-cde-9
-share/gnome/solfege/lesson-files/include/interval-elements
-share/gnome/solfege/lesson-files/include/progression-elements
-share/gnome/solfege/lesson-files/include/sc-master
-share/gnome/solfege/lesson-files/jsb-inventions
-share/gnome/solfege/lesson-files/melodic-intervals
-share/gnome/solfege/lesson-files/melodic-intervals-10
-share/gnome/solfege/lesson-files/melodic-intervals-2
-share/gnome/solfege/lesson-files/melodic-intervals-2-3
-share/gnome/solfege/lesson-files/melodic-intervals-2-to-8
-share/gnome/solfege/lesson-files/melodic-intervals-2int-2-3
-share/gnome/solfege/lesson-files/melodic-intervals-3
-share/gnome/solfege/lesson-files/melodic-intervals-4-5
-share/gnome/solfege/lesson-files/melodic-intervals-4-5-8
-share/gnome/solfege/lesson-files/melodic-intervals-6
-share/gnome/solfege/lesson-files/melodic-intervals-6-7
-share/gnome/solfege/lesson-files/melodic-intervals-7
-share/gnome/solfege/lesson-files/melodic-intervals-7-9
-share/gnome/solfege/lesson-files/melodic-intervals-9
-share/gnome/solfege/lesson-files/melodic-intervals-down
-share/gnome/solfege/lesson-files/melodic-intervals-down-10
-share/gnome/solfege/lesson-files/melodic-intervals-down-2
-share/gnome/solfege/lesson-files/melodic-intervals-down-2-3
-share/gnome/solfege/lesson-files/melodic-intervals-down-2-to-8
-share/gnome/solfege/lesson-files/melodic-intervals-down-3
-share/gnome/solfege/lesson-files/melodic-intervals-down-4-5
-share/gnome/solfege/lesson-files/melodic-intervals-down-4-5-8
-share/gnome/solfege/lesson-files/melodic-intervals-down-6
-share/gnome/solfege/lesson-files/melodic-intervals-down-6-7
-share/gnome/solfege/lesson-files/melodic-intervals-down-7
-share/gnome/solfege/lesson-files/melodic-intervals-down-7-9
-share/gnome/solfege/lesson-files/melodic-intervals-down-9
-share/gnome/solfege/lesson-files/melodic-intervals-down-tritonus-7
-share/gnome/solfege/lesson-files/melodic-intervals-self-config
-share/gnome/solfege/lesson-files/melodic-intervals-tritonus-7
-share/gnome/solfege/lesson-files/melodic-intervals-up
-share/gnome/solfege/lesson-files/melodic-intervals-up-10
-share/gnome/solfege/lesson-files/melodic-intervals-up-2
-share/gnome/solfege/lesson-files/melodic-intervals-up-2-3
-share/gnome/solfege/lesson-files/melodic-intervals-up-2-to-8
-share/gnome/solfege/lesson-files/melodic-intervals-up-3
-share/gnome/solfege/lesson-files/melodic-intervals-up-4-5
-share/gnome/solfege/lesson-files/melodic-intervals-up-4-5-8
-share/gnome/solfege/lesson-files/melodic-intervals-up-6
-share/gnome/solfege/lesson-files/melodic-intervals-up-6-7
-share/gnome/solfege/lesson-files/melodic-intervals-up-7
-share/gnome/solfege/lesson-files/melodic-intervals-up-7-9
-share/gnome/solfege/lesson-files/melodic-intervals-up-9
-share/gnome/solfege/lesson-files/melodic-intervals-up-tritonus-7
-share/gnome/solfege/lesson-files/nameinterval-1
-share/gnome/solfege/lesson-files/nameinterval-2
-share/gnome/solfege/lesson-files/nameinterval-fifths
-share/gnome/solfege/lesson-files/nameinterval-fourths
-share/gnome/solfege/lesson-files/nameinterval-octave
-share/gnome/solfege/lesson-files/nameinterval-seconds
-share/gnome/solfege/lesson-files/nameinterval-sevenths
-share/gnome/solfege/lesson-files/nameinterval-sixths
-share/gnome/solfege/lesson-files/nameinterval-thirds
-share/gnome/solfege/lesson-files/nameinterval-unison
-share/gnome/solfege/lesson-files/progression-1
-share/gnome/solfege/lesson-files/progression-2
-share/gnome/solfege/lesson-files/progression-atte
-share/gnome/solfege/lesson-files/progression-x
-share/gnome/solfege/lesson-files/rhythm-all
-share/gnome/solfege/lesson-files/rhythm-easy
-share/gnome/solfege/lesson-files/rhythm-mid
-share/gnome/solfege/lesson-files/rhythm-self-config-binary
-share/gnome/solfege/lesson-files/rhythm-self-config-ternary
-share/gnome/solfege/lesson-files/rhythm-ternary
-share/gnome/solfege/lesson-files/rhythmtapping2-self-config-binary
-share/gnome/solfege/lesson-files/rhythmtapping2-self-config-ternary
-share/gnome/solfege/lesson-files/sc-6tones
-share/gnome/solfege/lesson-files/sc-8tones
-share/gnome/solfege/lesson-files/sc-beb
-share/gnome/solfege/lesson-files/sc-beb-a
-share/gnome/solfege/lesson-files/sc-beb-d
-share/gnome/solfege/lesson-files/sc-beb-elem
-share/gnome/solfege/lesson-files/sc-beb-name
-share/gnome/solfege/lesson-files/sc-beb-s
-share/gnome/solfege/lesson-files/sc-church
-share/gnome/solfege/lesson-files/sc-dha
-share/gnome/solfege/lesson-files/sc-dha-a
-share/gnome/solfege/lesson-files/sc-dha-d
-share/gnome/solfege/lesson-files/sc-dha-elem
-share/gnome/solfege/lesson-files/sc-dha-f
-share/gnome/solfege/lesson-files/sc-dha-g
-share/gnome/solfege/lesson-files/sc-dha-name
-share/gnome/solfege/lesson-files/sc-dha-p
-share/gnome/solfege/lesson-files/sc-dha-s
-share/gnome/solfege/lesson-files/sc-dha-t
-share/gnome/solfege/lesson-files/sc-dom
-share/gnome/solfege/lesson-files/sc-dom-jazz
-share/gnome/solfege/lesson-files/sc-east
-share/gnome/solfege/lesson-files/sc-greek
-share/gnome/solfege/lesson-files/sc-hal
-share/gnome/solfege/lesson-files/sc-hal-jazz
-share/gnome/solfege/lesson-files/sc-ham
-share/gnome/solfege/lesson-files/sc-ham-a
-share/gnome/solfege/lesson-files/sc-ham-d
-share/gnome/solfege/lesson-files/sc-ham-elem
-share/gnome/solfege/lesson-files/sc-ham-f
-share/gnome/solfege/lesson-files/sc-ham-g
-share/gnome/solfege/lesson-files/sc-ham-name
-share/gnome/solfege/lesson-files/sc-ham-p
-share/gnome/solfege/lesson-files/sc-ham-s
-share/gnome/solfege/lesson-files/sc-ham-t
-share/gnome/solfege/lesson-files/sc-har
-share/gnome/solfege/lesson-files/sc-har-a
-share/gnome/solfege/lesson-files/sc-har-d
-share/gnome/solfege/lesson-files/sc-har-elem
-share/gnome/solfege/lesson-files/sc-har-f
-share/gnome/solfege/lesson-files/sc-har-g
-share/gnome/solfege/lesson-files/sc-har-name
-share/gnome/solfege/lesson-files/sc-har-p
-share/gnome/solfege/lesson-files/sc-har-s
-share/gnome/solfege/lesson-files/sc-har-t
-share/gnome/solfege/lesson-files/sc-hum-g
-share/gnome/solfege/lesson-files/sc-hun
-share/gnome/solfege/lesson-files/sc-hun-a
-share/gnome/solfege/lesson-files/sc-hun-d
-share/gnome/solfege/lesson-files/sc-hun-elem
-share/gnome/solfege/lesson-files/sc-hun-f
-share/gnome/solfege/lesson-files/sc-hun-g
-share/gnome/solfege/lesson-files/sc-hun-name
-share/gnome/solfege/lesson-files/sc-hun-p
-share/gnome/solfege/lesson-files/sc-hun-s
-share/gnome/solfege/lesson-files/sc-hun-t
-share/gnome/solfege/lesson-files/sc-maj
-share/gnome/solfege/lesson-files/sc-maj-a
-share/gnome/solfege/lesson-files/sc-maj-d
-share/gnome/solfege/lesson-files/sc-maj-elem
-share/gnome/solfege/lesson-files/sc-maj-f
-share/gnome/solfege/lesson-files/sc-maj-g
-share/gnome/solfege/lesson-files/sc-maj-name
-share/gnome/solfege/lesson-files/sc-maj-p
-share/gnome/solfege/lesson-files/sc-maj-px
-share/gnome/solfege/lesson-files/sc-maj-s
-share/gnome/solfege/lesson-files/sc-maj-t
-share/gnome/solfege/lesson-files/sc-mau
-share/gnome/solfege/lesson-files/sc-mau-jazz
-share/gnome/solfege/lesson-files/sc-mel
-share/gnome/solfege/lesson-files/sc-mel-a
-share/gnome/solfege/lesson-files/sc-mel-d
-share/gnome/solfege/lesson-files/sc-mel-elem
-share/gnome/solfege/lesson-files/sc-mel-f
-share/gnome/solfege/lesson-files/sc-mel-g
-share/gnome/solfege/lesson-files/sc-mel-name
-share/gnome/solfege/lesson-files/sc-mel-p
-share/gnome/solfege/lesson-files/sc-mel-s
-share/gnome/solfege/lesson-files/sc-mel-t
-share/gnome/solfege/lesson-files/sc-min
-share/gnome/solfege/lesson-files/sc-min-jazz
-share/gnome/solfege/lesson-files/sc-nat-g
-share/gnome/solfege/lesson-files/sc-nea
-share/gnome/solfege/lesson-files/sc-nea-a
-share/gnome/solfege/lesson-files/sc-nea-d
-share/gnome/solfege/lesson-files/sc-nea-elem
-share/gnome/solfege/lesson-files/sc-nea-f
-share/gnome/solfege/lesson-files/sc-nea-g
-share/gnome/solfege/lesson-files/sc-nea-name
-share/gnome/solfege/lesson-files/sc-nea-p
-share/gnome/solfege/lesson-files/sc-nea-s
-share/gnome/solfege/lesson-files/sc-nea-t
-share/gnome/solfege/lesson-files/sc-nem
-share/gnome/solfege/lesson-files/sc-nem-a
-share/gnome/solfege/lesson-files/sc-nem-d
-share/gnome/solfege/lesson-files/sc-nem-elem
-share/gnome/solfege/lesson-files/sc-nem-f
-share/gnome/solfege/lesson-files/sc-nem-g
-share/gnome/solfege/lesson-files/sc-nem-name
-share/gnome/solfege/lesson-files/sc-nem-p
-share/gnome/solfege/lesson-files/sc-nem-s
-share/gnome/solfege/lesson-files/sc-nem-t
-share/gnome/solfege/lesson-files/sc-pen
-share/gnome/solfege/lesson-files/sc-pen-a
-share/gnome/solfege/lesson-files/sc-pen-d
-share/gnome/solfege/lesson-files/sc-pen-elem
-share/gnome/solfege/lesson-files/sc-pen-g
-share/gnome/solfege/lesson-files/sc-pen-name
-share/gnome/solfege/lesson-files/sc-pen-s
-share/gnome/solfege/lesson-files/sc-plagal
-share/gnome/solfege/lesson-files/sc-sim
-share/gnome/solfege/lesson-files/sc-sim-a
-share/gnome/solfege/lesson-files/sc-sim-d
-share/gnome/solfege/lesson-files/sc-sim-elem
-share/gnome/solfege/lesson-files/sc-sim-name
-share/gnome/solfege/lesson-files/sc-sim-s
-share/gnome/solfege/lesson-files/scales
-share/gnome/solfege/lesson-files/scales-all
-share/gnome/solfege/lesson-files/scales-bebop
-share/gnome/solfege/lesson-files/scales-thirds
-share/gnome/solfege/lesson-files/share/fanfare.midi
-share/gnome/solfege/lesson-files/share/fifth-pure-220.00.wav
-share/gnome/solfege/lesson-files/share/fifth-pure-247.5.wav
-share/gnome/solfege/lesson-files/share/fifth-pure-293.33.wav
-share/gnome/solfege/lesson-files/share/fifth-small-220.00.wav
-share/gnome/solfege/lesson-files/share/fifth-small-247.5.wav
-share/gnome/solfege/lesson-files/share/fifth-small-293.33.wav
-share/gnome/solfege/lesson-files/share/fil1.orc
-share/gnome/solfege/lesson-files/share/fil1.sco
-share/gnome/solfege/lesson-files/sing-chord-tone
-share/gnome/solfege/lesson-files/sing-intervals
-share/gnome/solfege/lesson-files/sing-intervals-10
-share/gnome/solfege/lesson-files/sing-intervals-2
-share/gnome/solfege/lesson-files/sing-intervals-2-3
-share/gnome/solfege/lesson-files/sing-intervals-3
-share/gnome/solfege/lesson-files/sing-intervals-4-5
-share/gnome/solfege/lesson-files/sing-intervals-4-5-8
-share/gnome/solfege/lesson-files/sing-intervals-6
-share/gnome/solfege/lesson-files/sing-intervals-6-7
-share/gnome/solfege/lesson-files/sing-intervals-7
-share/gnome/solfege/lesson-files/sing-intervals-7-9
-share/gnome/solfege/lesson-files/sing-intervals-9
-share/gnome/solfege/lesson-files/sing-intervals-self-config
-share/gnome/solfege/lesson-files/sing-intervals-tritonus-7
-share/gnome/solfege/lesson-files/sing-the-fifth
-share/gnome/solfege/lesson-files/sing-the-root
-share/gnome/solfege/lesson-files/sing-the-seventh
-share/gnome/solfege/lesson-files/sing-the-third
-share/gnome/solfege/lesson-files/singchord-1
-share/gnome/solfege/lesson-files/singchord-2
-share/gnome/solfege/lesson-files/singchord-3
-share/gnome/solfege/lesson-files/singchord-4
-share/gnome/solfege/lesson-files/singchord-5
-share/gnome/solfege/lesson-files/singchord-6
-share/gnome/solfege/lesson-files/singchord-all
-share/gnome/solfege/lesson-files/tapping-all
-share/gnome/solfege/lesson-files/tapping-easy
-share/gnome/solfege/lesson-files/tapping-mid
-share/gnome/solfege/lesson-files/three-prog-root
-share/gnome/solfege/lesson-files/twelvetone
-share/gnome/solfege/lesson-files/two-prog-root
-share/gnome/solfege/lesson-files/volkslieder1
-share/gnome/solfege/lesson-files/volkslieder2
-share/gnome/solfege/mpd/__init__.py
-share/gnome/solfege/mpd/_exceptions.py
-share/gnome/solfege/mpd/const.py
-share/gnome/solfege/mpd/duration.py
-share/gnome/solfege/mpd/engravers.py
-share/gnome/solfege/mpd/interval.py
-share/gnome/solfege/mpd/mfutils.py
-share/gnome/solfege/mpd/mpdutils.py
-share/gnome/solfege/mpd/musicalpitch.py
-share/gnome/solfege/mpd/musicdisplayer.py
-share/gnome/solfege/mpd/parser.py
-share/gnome/solfege/mpd/rat.py
-share/gnome/solfege/mpd/requests.py
-share/gnome/solfege/mpd/track.py
-share/gnome/solfege/solfege.gtkrc
-share/gnome/solfege/soundcard/__init__.py
-share/gnome/solfege/soundcard/exporter.py
-share/gnome/solfege/soundcard/fakesynth.py
-share/gnome/solfege/soundcard/midifilesynth.py
-share/gnome/solfege/soundcard/oss_common.py
-share/gnome/solfege/soundcard/oss_sequencer.py
-share/gnome/solfege/soundcard/oss_sequencer2.py
-share/gnome/solfege/soundcard/solfege_c_midi.py
-share/gnome/solfege/soundcard/soundcardexceptions.py
-share/gnome/solfege/soundcard/synth_common.py
-share/gnome/solfege/soundcard/winsynth.py
-share/gnome/solfege/src/ElementTree.py
-share/gnome/solfege/src/__init__.py
-share/gnome/solfege/src/abstract.py
-share/gnome/solfege/src/app.py
-share/gnome/solfege/src/cfg.py
-share/gnome/solfege/src/chord.py
-share/gnome/solfege/src/chordvoicing.py
-share/gnome/solfege/src/compareintervals.py
-share/gnome/solfege/src/configureoutput.py
-share/gnome/solfege/src/configwindow.py
-share/gnome/solfege/src/const.py
-share/gnome/solfege/src/dataparser.py
-share/gnome/solfege/src/dictation.py
-share/gnome/solfege/src/docviewer.py
-share/gnome/solfege/src/elembuilder.py
-share/gnome/solfege/src/example.py
-share/gnome/solfege/src/exceptiondialog.py
-share/gnome/solfege/src/filesystem.py
-share/gnome/solfege/src/gpath.py
-share/gnome/solfege/src/gu.py
-share/gnome/solfege/src/harmonicinterval.py
-share/gnome/solfege/src/harmonicprogressiondictation.py
-share/gnome/solfege/src/helpbrowser.py
-share/gnome/solfege/src/history.py
-share/gnome/solfege/src/htmlwidget.py
-share/gnome/solfege/src/i18n.py
-share/gnome/solfege/src/idbyname.py
-share/gnome/solfege/src/identifybpm.py
-share/gnome/solfege/src/idtone.py
-share/gnome/solfege/src/inputwidgets.py
-share/gnome/solfege/src/instrumentselector.py
-share/gnome/solfege/src/languages.py
-share/gnome/solfege/src/learning_tree_editor.py
-share/gnome/solfege/src/lessonfile.py
-share/gnome/solfege/src/lessonfile_editor_main.py
-share/gnome/solfege/src/lessonfilegui.py
-share/gnome/solfege/src/mainwin.py
-share/gnome/solfege/src/melodicinterval.py
-share/gnome/solfege/src/multipleintervalconfigwidget.py
-share/gnome/solfege/src/nameinterval.py
-share/gnome/solfege/src/notenamespinbutton.py
-share/gnome/solfege/src/osutils.py
-share/gnome/solfege/src/pmwiki.py
-share/gnome/solfege/src/practisesheetdlg.py
-share/gnome/solfege/src/reportbug.py
-share/gnome/solfege/src/reportlib.py
-share/gnome/solfege/src/rhythm.py
-share/gnome/solfege/src/rhythmtapping.py
-share/gnome/solfege/src/rhythmtapping2.py
-share/gnome/solfege/src/runtime.py
-share/gnome/solfege/src/singanswer.py
-share/gnome/solfege/src/singchord.py
-share/gnome/solfege/src/singinterval.py
-share/gnome/solfege/src/specialwidgets.py
-share/gnome/solfege/src/statistics.py
-share/gnome/solfege/src/statisticsviewer.py
-share/gnome/solfege/src/stock.py
-share/gnome/solfege/src/testlib.py
-share/gnome/solfege/src/tracebackwindow.py
-share/gnome/solfege/src/trainingsetdlg.py
-share/gnome/solfege/src/tree.py
-share/gnome/solfege/src/tuner.py
-share/gnome/solfege/src/twelvetone.py
-share/gnome/solfege/src/utils.py
-share/gnome/solfege/src/uuid.py
-share/gnome/solfege/src/winreg.py
-share/gnome/solfege/src/xrandom.py
-share/gnome/solfege/themes/svg/chord-voicing.svg
-share/gnome/solfege/themes/svg/chord.svg
-share/gnome/solfege/themes/svg/happyface.svg
-share/gnome/solfege/themes/svg/harmonic-interval.svg
-share/gnome/solfege/themes/svg/id-by-name.svg
-share/gnome/solfege/themes/svg/mal.svg
-share/gnome/solfege/themes/svg/melodic-interval.svg
-share/gnome/solfege/themes/svg/sadface.svg
-share/gnome/solfege/themes/svg/sing-chord.svg
-share/gnome/solfege/themes/svg/sing-interval.svg
-share/gnome/solfege/themes/svg/solfege.svg
-share/gnome/solfege/ui.xml
+share/applications/solfege.desktop
+share/pixmaps/solfege.png
+share/solfege/debugtree.txt
+share/solfege/default.config
+share/solfege/example-lesson-files/chord-satb
+share/solfege/example-lesson-files/example-1
+share/solfege/example-lesson-files/harmonic-progression-dictation
+share/solfege/example-lesson-files/id-by-name-1
+share/solfege/example-lesson-files/id-by-name-2
+share/solfege/example-lesson-files/learn-min-major-1
+share/solfege/example-lesson-files/learn-min-major-2
+share/solfege/example-lesson-files/learn-min-major-3
+share/solfege/example-lesson-files/sing-chord
+share/solfege/example-lesson-files/very-easy-scale
+share/solfege/example-lesson-files/very-easy-scale2
+share/solfege/feta/feta20-accidentals--1.xpm
+share/solfege/feta/feta20-accidentals--2.xpm
+share/solfege/feta/feta20-accidentals-0.xpm
+share/solfege/feta/feta20-accidentals-1.xpm
+share/solfege/feta/feta20-accidentals-2.xpm
+share/solfege/feta/feta20-clefs-C.xpm
+share/solfege/feta/feta20-clefs-F.xpm
+share/solfege/feta/feta20-clefs-G.xpm
+share/solfege/feta/feta20-dots-dot.xpm
+share/solfege/feta/feta20-flags-d3.xpm
+share/solfege/feta/feta20-flags-d4.xpm
+share/solfege/feta/feta20-flags-d5.xpm
+share/solfege/feta/feta20-flags-d6.xpm
+share/solfege/feta/feta20-flags-u3.xpm
+share/solfege/feta/feta20-flags-u4.xpm
+share/solfege/feta/feta20-flags-u5.xpm
+share/solfege/feta/feta20-flags-u6.xpm
+share/solfege/feta/feta20-noteheads-0.xpm
+share/solfege/feta/feta20-noteheads-1.xpm
+share/solfege/feta/feta20-noteheads-2.xpm
+share/solfege/feta/feta20-number-0.xpm
+share/solfege/feta/feta20-number-1.xpm
+share/solfege/feta/feta20-number-2.xpm
+share/solfege/feta/feta20-number-3.xpm
+share/solfege/feta/feta20-number-4.xpm
+share/solfege/feta/feta20-number-5.xpm
+share/solfege/feta/feta20-number-6.xpm
+share/solfege/feta/feta20-number-7.xpm
+share/solfege/feta/feta20-number-8.xpm
+share/solfege/feta/feta20-number-9.xpm
+share/solfege/feta/feta20-rests--1.xpm
+share/solfege/feta/feta20-rests--2.xpm
+share/solfege/feta/feta20-rests--4.xpm
+share/solfege/feta/feta20-rests-0.xpm
+share/solfege/feta/feta20-rests-0o.xpm
+share/solfege/feta/feta20-rests-1.xpm
+share/solfege/feta/feta20-rests-1o.xpm
+share/solfege/feta/feta20-rests-2.xpm
+share/solfege/feta/feta20-rests-3.xpm
+share/solfege/feta/feta20-rests-4.xpm
+share/solfege/feta/feta20-rests-5.xpm
+share/solfege/feta/feta20-rests-6.xpm
+share/solfege/feta/feta20-rests-7.xpm
+share/solfege/graphics/chord-voicing.png
+share/solfege/graphics/chord.png
+share/solfege/graphics/compare-intervals.png
+share/solfege/graphics/dictation.png
+share/solfege/graphics/double-flat.png
+share/solfege/graphics/double-flat.svg
+share/solfege/graphics/double-sharp.png
+share/solfege/graphics/double-sharp.svg
+share/solfege/graphics/erase.png
+share/solfege/graphics/erase.svg
+share/solfege/graphics/flat.png
+share/solfege/graphics/flat.svg
+share/solfege/graphics/happyface.png
+share/solfege/graphics/harmonic-interval.png
+share/solfege/graphics/harmonic-progression-dictation.png
+share/solfege/graphics/holder.png
+share/solfege/graphics/id-by-name.png
+share/solfege/graphics/id-tone.png
+share/solfege/graphics/identify-bpm.png
+share/solfege/graphics/identify-chord.png
+share/solfege/graphics/identify-scale.png
+share/solfege/graphics/image-not-found.png
+share/solfege/graphics/melodic-interval.png
+share/solfege/graphics/natural.png
+share/solfege/graphics/natural.svg
+share/solfege/graphics/notehead.png
+share/solfege/graphics/notehead.svg
+share/solfege/graphics/rhythm-c12c12c12.png
+share/solfege/graphics/rhythm-c12c12r12.png
+share/solfege/graphics/rhythm-c12r12c12.png
+share/solfege/graphics/rhythm-c16c16c16c16.png
+share/solfege/graphics/rhythm-c16c16c16c16c16c16.png
+share/solfege/graphics/rhythm-c16c16c16c16c8.png
+share/solfege/graphics/rhythm-c16c16c4.png
+share/solfege/graphics/rhythm-c16c16c8.png
+share/solfege/graphics/rhythm-c16c16c8c16c16.png
+share/solfege/graphics/rhythm-c16c16c8c8.png
+share/solfege/graphics/rhythm-c16c8..png
+share/solfege/graphics/rhythm-c16c8c16.png
+share/solfege/graphics/rhythm-c4..png
+share/solfege/graphics/rhythm-c4.png
+share/solfege/graphics/rhythm-c4c16c16.png
+share/solfege/graphics/rhythm-c4c8.png
+share/solfege/graphics/rhythm-c8.c16.png
+share/solfege/graphics/rhythm-c8c16c16.png
+share/solfege/graphics/rhythm-c8c16c16c16c16.png
+share/solfege/graphics/rhythm-c8c16c16c8.png
+share/solfege/graphics/rhythm-c8c4.png
+share/solfege/graphics/rhythm-c8c8.png
+share/solfege/graphics/rhythm-c8c8c16c16.png
+share/solfege/graphics/rhythm-c8c8c8.png
+share/solfege/graphics/rhythm-r12c12c12.png
+share/solfege/graphics/rhythm-r12c12r12.png
+share/solfege/graphics/rhythm-r12r12c12.png
+share/solfege/graphics/rhythm-r16c16c16c16.png
+share/solfege/graphics/rhythm-r16c16c8.png
+share/solfege/graphics/rhythm-r16c8..png
+share/solfege/graphics/rhythm-r16c8c16.png
+share/solfege/graphics/rhythm-r4.png
+share/solfege/graphics/rhythm-r8c16c16.png
+share/solfege/graphics/rhythm-r8c8.png
+share/solfege/graphics/rhythm-r8r16c16.png
+share/solfege/graphics/rhythm-wrong.png
+share/solfege/graphics/rhythm.png
+share/solfege/graphics/sadface.png
+share/solfege/graphics/sharp.png
+share/solfege/graphics/sharp.svg
+share/solfege/graphics/sing-chord.png
+share/solfege/graphics/sing-interval.png
+share/solfege/graphics/solfege.png
+share/solfege/graphics/solfege.svg
+share/solfege/graphics/solfege.xpm
+share/solfege/graphics/test-sound.png
+share/solfege/graphics/twelve-tone.png
+share/solfege/help-menu.xml
+share/solfege/help/C/apb.html
+share/solfege/help/C/bug-reporting.html
+share/solfege/help/C/chord-module.html
+share/solfege/help/C/chord.html
+share/solfege/help/C/compareintervals-module.html
+share/solfege/help/C/dictation-module.html
+share/solfege/help/C/dictation.html
+share/solfege/help/C/ear-training-test-printout-editor.html
+share/solfege/help/C/elembuilder-module.html
+share/solfege/help/C/elembuilder.html
+share/solfege/help/C/extending-solfege.html
+share/solfege/help/C/figures/chord.png
+share/solfege/help/C/figures/dictation.png
+share/solfege/help/C/figures/elembuilder-harmonic-progressions.png
+share/solfege/help/C/figures/id-interval-buttons-thirds.png
+share/solfege/help/C/figures/id-interval-piano.png
+share/solfege/help/C/figures/idbyname-chords.png
+share/solfege/help/C/figures/idbyname-intonation.png
+share/solfege/help/C/figures/identifybpm.png
+share/solfege/help/C/figures/idtone.png
+share/solfege/help/C/figures/nameinterval.png
+share/solfege/help/C/figures/preferences-gui.png
+share/solfege/help/C/figures/preferences-midi.png
+share/solfege/help/C/figures/preferences-practise.png
+share/solfege/help/C/figures/preferences-sound-setup.png
+share/solfege/help/C/figures/preferences-user.png
+share/solfege/help/C/figures/rhythm.png
+share/solfege/help/C/figures/singchord.png
+share/solfege/help/C/figures/singinterval.png
+share/solfege/help/C/figures/trainingset-editor.png
+share/solfege/help/C/figures/twelvetone.png
+share/solfege/help/C/gpl-2.html
+share/solfege/help/C/gpl-3.html
+share/solfege/help/C/gpl.html
+share/solfege/help/C/harmonicinterval-module.html
+share/solfege/help/C/harmonicinterval.html
+share/solfege/help/C/idbyname-chords.html
+share/solfege/help/C/idbyname-intonation.html
+share/solfege/help/C/idbyname-module.html
+share/solfege/help/C/identifybpm.html
+share/solfege/help/C/idtone-module.html
+share/solfege/help/C/idtone.html
+share/solfege/help/C/index.html
+share/solfege/help/C/inverting-intervals.html
+share/solfege/help/C/lesson-files.html
+share/solfege/help/C/ly/inverting-intervals.png
+share/solfege/help/C/ly/theory-intervals-1.png
+share/solfege/help/C/ly/theory-intervals-fifths-1.png
+share/solfege/help/C/ly/theory-intervals-fifths-2.png
+share/solfege/help/C/ly/theory-intervals-fifths.png
+share/solfege/help/C/ly/theory-intervals-fourths.png
+share/solfege/help/C/ly/theory-intervals-seconds-1.png
+share/solfege/help/C/ly/theory-intervals-seconds-2.png
+share/solfege/help/C/ly/theory-intervals-seconds-3.png
+share/solfege/help/C/ly/theory-intervals-seconds.png
+share/solfege/help/C/ly/theory-intervals-sevenths.png
+share/solfege/help/C/ly/theory-intervals-sixths.png
+share/solfege/help/C/ly/theory-intervals-thirds.png
+share/solfege/help/C/melodicinterval-module.html
+share/solfege/help/C/melodicinterval.html
+share/solfege/help/C/midi-instrument-names.html
+share/solfege/help/C/music-theory.html
+share/solfege/help/C/nameinterval-module.html
+share/solfege/help/C/nameinterval.html
+share/solfege/help/C/online-resources.html
+share/solfege/help/C/preferences-window.html
+share/solfege/help/C/rhythm-module.html
+share/solfege/help/C/rhythm.html
+share/solfege/help/C/rhythmtapping-module.html
+share/solfege/help/C/rhythmtapping2-module.html
+share/solfege/help/C/rhythmtapping2.html
+share/solfege/help/C/scales.html
+share/solfege/help/C/singanswer-module.html
+share/solfege/help/C/singchord-module.html
+share/solfege/help/C/singchord.html
+share/solfege/help/C/singinterval-module.html
+share/solfege/help/C/singinterval.html
+share/solfege/help/C/solfege-exercise-helps.html
+share/solfege/help/C/solfege-intro.html
+share/solfege/help/C/theory-intervals.html
+share/solfege/help/C/trainingset-editor.html
+share/solfege/help/C/twelvetone.html
+share/solfege/help/C/welcome.html
+share/solfege/help/fr/apb.html
+share/solfege/help/fr/bug-reporting.html
+share/solfege/help/fr/chord-module.html
+share/solfege/help/fr/chord.html
+share/solfege/help/fr/compareintervals-module.html
+share/solfege/help/fr/dictation-module.html
+share/solfege/help/fr/dictation.html
+share/solfege/help/fr/ear-training-test-printout-editor.html
+share/solfege/help/fr/elembuilder-module.html
+share/solfege/help/fr/elembuilder.html
+share/solfege/help/fr/extending-solfege.html
+share/solfege/help/fr/figures/chord.png
+share/solfege/help/fr/figures/dictation.png
+share/solfege/help/fr/figures/id-interval-buttons-thirds.png
+share/solfege/help/fr/figures/id-interval-piano.png
+share/solfege/help/fr/figures/idbyname-chords.png
+share/solfege/help/fr/figures/idbyname-intonation.png
+share/solfege/help/fr/figures/identifybpm.png
+share/solfege/help/fr/figures/idtone.png
+share/solfege/help/fr/figures/preferences-gui.png
+share/solfege/help/fr/figures/preferences-midi.png
+share/solfege/help/fr/figures/preferences-practise.png
+share/solfege/help/fr/figures/preferences-sound-setup.png
+share/solfege/help/fr/figures/preferences-user.png
+share/solfege/help/fr/figures/rhythm.png
+share/solfege/help/fr/figures/singchord.png
+share/solfege/help/fr/figures/singinterval.png
+share/solfege/help/fr/figures/twelvetone.png
+share/solfege/help/fr/gpl-2.html
+share/solfege/help/fr/gpl-3.html
+share/solfege/help/fr/gpl.html
+share/solfege/help/fr/harmonicinterval-module.html
+share/solfege/help/fr/harmonicinterval.html
+share/solfege/help/fr/idbyname-chords.html
+share/solfege/help/fr/idbyname-intonation.html
+share/solfege/help/fr/idbyname-module.html
+share/solfege/help/fr/identifybpm.html
+share/solfege/help/fr/idtone-module.html
+share/solfege/help/fr/idtone.html
+share/solfege/help/fr/index.html
+share/solfege/help/fr/inverting-intervals.html
+share/solfege/help/fr/lesson-files.html
+share/solfege/help/fr/melodicinterval-module.html
+share/solfege/help/fr/melodicinterval.html
+share/solfege/help/fr/midi-instrument-names.html
+share/solfege/help/fr/music-theory.html
+share/solfege/help/fr/nameinterval-module.html
+share/solfege/help/fr/nameinterval.html
+share/solfege/help/fr/online-resources.html
+share/solfege/help/fr/preferences-window.html
+share/solfege/help/fr/rhythm-module.html
+share/solfege/help/fr/rhythm.html
+share/solfege/help/fr/rhythmtapping-module.html
+share/solfege/help/fr/rhythmtapping2-module.html
+share/solfege/help/fr/rhythmtapping2.html
+share/solfege/help/fr/scales.html
+share/solfege/help/fr/singanswer-module.html
+share/solfege/help/fr/singchord-module.html
+share/solfege/help/fr/singchord.html
+share/solfege/help/fr/singinterval-module.html
+share/solfege/help/fr/singinterval.html
+share/solfege/help/fr/solfege-exercise-helps.html
+share/solfege/help/fr/solfege-intro.html
+share/solfege/help/fr/theory-intervals.html
+share/solfege/help/fr/trainingset-editor.html
+share/solfege/help/fr/twelvetone.html
+share/solfege/help/fr/welcome.html
+share/solfege/help/no/apb.html
+share/solfege/help/no/bug-reporting.html
+share/solfege/help/no/chord-module.html
+share/solfege/help/no/chord.html
+share/solfege/help/no/compareintervals-module.html
+share/solfege/help/no/dictation-module.html
+share/solfege/help/no/dictation.html
+share/solfege/help/no/ear-training-test-printout-editor.html
+share/solfege/help/no/elembuilder-module.html
+share/solfege/help/no/elembuilder.html
+share/solfege/help/no/extending-solfege.html
+share/solfege/help/no/figures/chord.png
+share/solfege/help/no/figures/dictation.png
+share/solfege/help/no/figures/id-interval-buttons-thirds.png
+share/solfege/help/no/figures/id-interval-piano.png
+share/solfege/help/no/figures/idbyname-chords.png
+share/solfege/help/no/figures/idbyname-intonation.png
+share/solfege/help/no/figures/identifybpm.png
+share/solfege/help/no/figures/idtone.png
+share/solfege/help/no/figures/preferences-gui.png
+share/solfege/help/no/figures/preferences-midi.png
+share/solfege/help/no/figures/preferences-practise.png
+share/solfege/help/no/figures/preferences-sound-setup.png
+share/solfege/help/no/figures/preferences-user.png
+share/solfege/help/no/figures/rhythm.png
+share/solfege/help/no/figures/singchord.png
+share/solfege/help/no/figures/singinterval.png
+share/solfege/help/no/figures/twelvetone.png
+share/solfege/help/no/gpl-2.html
+share/solfege/help/no/gpl-3.html
+share/solfege/help/no/gpl.html
+share/solfege/help/no/harmonicinterval-module.html
+share/solfege/help/no/harmonicinterval.html
+share/solfege/help/no/idbyname-chords.html
+share/solfege/help/no/idbyname-intonation.html
+share/solfege/help/no/idbyname-module.html
+share/solfege/help/no/identifybpm.html
+share/solfege/help/no/idtone-module.html
+share/solfege/help/no/idtone.html
+share/solfege/help/no/index.html
+share/solfege/help/no/inverting-intervals.html
+share/solfege/help/no/lesson-files.html
+share/solfege/help/no/melodicinterval-module.html
+share/solfege/help/no/melodicinterval.html
+share/solfege/help/no/midi-instrument-names.html
+share/solfege/help/no/music-theory.html
+share/solfege/help/no/nameinterval-module.html
+share/solfege/help/no/nameinterval.html
+share/solfege/help/no/online-resources.html
+share/solfege/help/no/preferences-window.html
+share/solfege/help/no/rhythm-module.html
+share/solfege/help/no/rhythm.html
+share/solfege/help/no/rhythmtapping-module.html
+share/solfege/help/no/rhythmtapping2-module.html
+share/solfege/help/no/rhythmtapping2.html
+share/solfege/help/no/scales.html
+share/solfege/help/no/singanswer-module.html
+share/solfege/help/no/singchord-module.html
+share/solfege/help/no/singchord.html
+share/solfege/help/no/singinterval-module.html
+share/solfege/help/no/singinterval.html
+share/solfege/help/no/solfege-exercise-helps.html
+share/solfege/help/no/solfege-intro.html
+share/solfege/help/no/theory-intervals.html
+share/solfege/help/no/trainingset-editor.html
+share/solfege/help/no/twelvetone.html
+share/solfege/help/no/welcome.html
+share/solfege/help/pt_BR/apb.html
+share/solfege/help/pt_BR/bug-reporting.html
+share/solfege/help/pt_BR/chord-module.html
+share/solfege/help/pt_BR/chord.html
+share/solfege/help/pt_BR/compareintervals-module.html
+share/solfege/help/pt_BR/dictation-module.html
+share/solfege/help/pt_BR/dictation.html
+share/solfege/help/pt_BR/ear-training-test-printout-editor.html
+share/solfege/help/pt_BR/elembuilder-module.html
+share/solfege/help/pt_BR/elembuilder.html
+share/solfege/help/pt_BR/extending-solfege.html
+share/solfege/help/pt_BR/figures/chord.png
+share/solfege/help/pt_BR/figures/dictation.png
+share/solfege/help/pt_BR/figures/id-interval-buttons-thirds.png
+share/solfege/help/pt_BR/figures/id-interval-piano.png
+share/solfege/help/pt_BR/figures/idbyname-chords.png
+share/solfege/help/pt_BR/figures/identifybpm.png
+share/solfege/help/pt_BR/figures/idtone.png
+share/solfege/help/pt_BR/figures/preferences-gui.png
+share/solfege/help/pt_BR/figures/preferences-midi.png
+share/solfege/help/pt_BR/figures/preferences-practise.png
+share/solfege/help/pt_BR/figures/preferences-sound-setup.png
+share/solfege/help/pt_BR/figures/preferences-user.png
+share/solfege/help/pt_BR/figures/rhythm.png
+share/solfege/help/pt_BR/figures/singchord.png
+share/solfege/help/pt_BR/figures/singinterval.png
+share/solfege/help/pt_BR/figures/twelvetone.png
+share/solfege/help/pt_BR/gpl-2.html
+share/solfege/help/pt_BR/gpl-3.html
+share/solfege/help/pt_BR/gpl.html
+share/solfege/help/pt_BR/harmonicinterval-module.html
+share/solfege/help/pt_BR/harmonicinterval.html
+share/solfege/help/pt_BR/idbyname-chords.html
+share/solfege/help/pt_BR/idbyname-intonation.html
+share/solfege/help/pt_BR/idbyname-module.html
+share/solfege/help/pt_BR/identifybpm.html
+share/solfege/help/pt_BR/idtone-module.html
+share/solfege/help/pt_BR/idtone.html
+share/solfege/help/pt_BR/index.html
+share/solfege/help/pt_BR/inverting-intervals.html
+share/solfege/help/pt_BR/lesson-files.html
+share/solfege/help/pt_BR/melodicinterval-module.html
+share/solfege/help/pt_BR/melodicinterval.html
+share/solfege/help/pt_BR/midi-instrument-names.html
+share/solfege/help/pt_BR/music-theory.html
+share/solfege/help/pt_BR/nameinterval-module.html
+share/solfege/help/pt_BR/nameinterval.html
+share/solfege/help/pt_BR/online-resources.html
+share/solfege/help/pt_BR/preferences-window.html
+share/solfege/help/pt_BR/rhythm-module.html
+share/solfege/help/pt_BR/rhythm.html
+share/solfege/help/pt_BR/rhythmtapping-module.html
+share/solfege/help/pt_BR/rhythmtapping2-module.html
+share/solfege/help/pt_BR/rhythmtapping2.html
+share/solfege/help/pt_BR/scales.html
+share/solfege/help/pt_BR/singanswer-module.html
+share/solfege/help/pt_BR/singchord-module.html
+share/solfege/help/pt_BR/singchord.html
+share/solfege/help/pt_BR/singinterval-module.html
+share/solfege/help/pt_BR/singinterval.html
+share/solfege/help/pt_BR/solfege-exercise-helps.html
+share/solfege/help/pt_BR/solfege-intro.html
+share/solfege/help/pt_BR/theory-intervals.html
+share/solfege/help/pt_BR/trainingset-editor.html
+share/solfege/help/pt_BR/twelvetone.html
+share/solfege/help/pt_BR/welcome.html
+share/solfege/help/tr/apb.html
+share/solfege/help/tr/bug-reporting.html
+share/solfege/help/tr/chord-module.html
+share/solfege/help/tr/chord.html
+share/solfege/help/tr/compareintervals-module.html
+share/solfege/help/tr/dictation-module.html
+share/solfege/help/tr/dictation.html
+share/solfege/help/tr/ear-training-test-printout-editor.html
+share/solfege/help/tr/elembuilder-module.html
+share/solfege/help/tr/elembuilder.html
+share/solfege/help/tr/extending-solfege.html
+share/solfege/help/tr/figures/chord.png
+share/solfege/help/tr/figures/dictation.png
+share/solfege/help/tr/figures/id-interval-buttons-thirds.png
+share/solfege/help/tr/figures/id-interval-piano.png
+share/solfege/help/tr/figures/idbyname-chords.png
+share/solfege/help/tr/figures/idbyname-intonation.png
+share/solfege/help/tr/figures/identifybpm.png
+share/solfege/help/tr/figures/idtone.png
+share/solfege/help/tr/figures/preferences-gui.png
+share/solfege/help/tr/figures/preferences-midi.png
+share/solfege/help/tr/figures/preferences-practise.png
+share/solfege/help/tr/figures/preferences-sound-setup.png
+share/solfege/help/tr/figures/preferences-user.png
+share/solfege/help/tr/figures/rhythm.png
+share/solfege/help/tr/figures/singchord.png
+share/solfege/help/tr/figures/singinterval.png
+share/solfege/help/tr/figures/twelvetone.png
+share/solfege/help/tr/gpl-2.html
+share/solfege/help/tr/gpl-3.html
+share/solfege/help/tr/gpl.html
+share/solfege/help/tr/harmonicinterval-module.html
+share/solfege/help/tr/harmonicinterval.html
+share/solfege/help/tr/idbyname-chords.html
+share/solfege/help/tr/idbyname-intonation.html
+share/solfege/help/tr/idbyname-module.html
+share/solfege/help/tr/identifybpm.html
+share/solfege/help/tr/idtone-module.html
+share/solfege/help/tr/idtone.html
+share/solfege/help/tr/index.html
+share/solfege/help/tr/inverting-intervals.html
+share/solfege/help/tr/lesson-files.html
+share/solfege/help/tr/melodicinterval-module.html
+share/solfege/help/tr/melodicinterval.html
+share/solfege/help/tr/midi-instrument-names.html
+share/solfege/help/tr/music-theory.html
+share/solfege/help/tr/nameinterval-module.html
+share/solfege/help/tr/nameinterval.html
+share/solfege/help/tr/online-resources.html
+share/solfege/help/tr/preferences-window.html
+share/solfege/help/tr/rhythm-module.html
+share/solfege/help/tr/rhythm.html
+share/solfege/help/tr/rhythmtapping-module.html
+share/solfege/help/tr/rhythmtapping2-module.html
+share/solfege/help/tr/rhythmtapping2.html
+share/solfege/help/tr/scales.html
+share/solfege/help/tr/singanswer-module.html
+share/solfege/help/tr/singchord-module.html
+share/solfege/help/tr/singchord.html
+share/solfege/help/tr/singinterval-module.html
+share/solfege/help/tr/singinterval.html
+share/solfege/help/tr/solfege-exercise-helps.html
+share/solfege/help/tr/solfege-intro.html
+share/solfege/help/tr/theory-intervals.html
+share/solfege/help/tr/trainingset-editor.html
+share/solfege/help/tr/twelvetone.html
+share/solfege/help/tr/welcome.html
+share/solfege/helpbrowser.xml
+share/solfege/learningtree.txt
+share/solfege/lesson-files/altered-1
+share/solfege/lesson-files/altered-2
+share/solfege/lesson-files/barnesanger
+share/solfege/lesson-files/besifring
+share/solfege/lesson-files/bin/csound-play-harmonic-interval.sh
+share/solfege/lesson-files/bpm
+share/solfege/lesson-files/chord-7b9-maj79
+share/solfege/lesson-files/chord-all
+share/solfege/lesson-files/chord-all-inv
+share/solfege/lesson-files/chord-dim-aug
+share/solfege/lesson-files/chord-dim-aug-min-major
+share/solfege/lesson-files/chord-m7-7
+share/solfege/lesson-files/chord-m7-7-inv
+share/solfege/lesson-files/chord-m7-7-inv-not
+share/solfege/lesson-files/chord-m7-7-maj7-m7b5-dim7
+share/solfege/lesson-files/chord-m9-9
+share/solfege/lesson-files/chord-m9-9-7b9-maj79
+share/solfege/lesson-files/chord-maj7-m7b5-dim7
+share/solfege/lesson-files/chord-min-major
+share/solfege/lesson-files/chord-min-major-7
+share/solfege/lesson-files/chord-min-major-close-open
+share/solfege/lesson-files/chord-min-major-inv
+share/solfege/lesson-files/chord-min-major-inv-not
+share/solfege/lesson-files/chord-voicing-test
+share/solfege/lesson-files/compare-intervals
+share/solfege/lesson-files/compare-intervals-harmonic
+share/solfege/lesson-files/compare-intervals-harmonic-10
+share/solfege/lesson-files/compare-intervals-harmonic-2
+share/solfege/lesson-files/compare-intervals-harmonic-2-3
+share/solfege/lesson-files/compare-intervals-harmonic-3
+share/solfege/lesson-files/compare-intervals-harmonic-4-5
+share/solfege/lesson-files/compare-intervals-harmonic-4-5-8
+share/solfege/lesson-files/compare-intervals-harmonic-6
+share/solfege/lesson-files/compare-intervals-harmonic-6-7
+share/solfege/lesson-files/compare-intervals-harmonic-7
+share/solfege/lesson-files/compare-intervals-harmonic-7-9
+share/solfege/lesson-files/compare-intervals-harmonic-9
+share/solfege/lesson-files/compare-intervals-harmonic-tritonus-7
+share/solfege/lesson-files/csound-fifth-0.97
+share/solfege/lesson-files/csound-fifth-0.98
+share/solfege/lesson-files/csound-fifth-0.99
+share/solfege/lesson-files/csound-fifth-0.995
+share/solfege/lesson-files/csound-fifth-0.996
+share/solfege/lesson-files/csound-fifth-0.997
+share/solfege/lesson-files/csound-fifth-0.998
+share/solfege/lesson-files/diatonic-1
+share/solfege/lesson-files/diatonic-2
+share/solfege/lesson-files/durmoll
+share/solfege/lesson-files/fifth-small-pure-0.99
+share/solfege/lesson-files/harmonic-intervals
+share/solfege/lesson-files/harmonic-intervals-10
+share/solfege/lesson-files/harmonic-intervals-2
+share/solfege/lesson-files/harmonic-intervals-2-3
+share/solfege/lesson-files/harmonic-intervals-2-to-8
+share/solfege/lesson-files/harmonic-intervals-3
+share/solfege/lesson-files/harmonic-intervals-4-5
+share/solfege/lesson-files/harmonic-intervals-4-5-8
+share/solfege/lesson-files/harmonic-intervals-6
+share/solfege/lesson-files/harmonic-intervals-6-7
+share/solfege/lesson-files/harmonic-intervals-7
+share/solfege/lesson-files/harmonic-intervals-7-9
+share/solfege/lesson-files/harmonic-intervals-9
+share/solfege/lesson-files/harmonic-intervals-self-config
+share/solfege/lesson-files/harmonic-intervals-tritonus-7
+share/solfege/lesson-files/id-tone
+share/solfege/lesson-files/id-tone-cde-10
+share/solfege/lesson-files/id-tone-cde-11
+share/solfege/lesson-files/id-tone-cde-12
+share/solfege/lesson-files/id-tone-cde-3
+share/solfege/lesson-files/id-tone-cde-4
+share/solfege/lesson-files/id-tone-cde-5
+share/solfege/lesson-files/id-tone-cde-6
+share/solfege/lesson-files/id-tone-cde-7
+share/solfege/lesson-files/id-tone-cde-8
+share/solfege/lesson-files/id-tone-cde-9
+share/solfege/lesson-files/include/interval-elements
+share/solfege/lesson-files/include/progression-elements
+share/solfege/lesson-files/include/sc-master
+share/solfege/lesson-files/jsb-inventions
+share/solfege/lesson-files/melodic-intervals
+share/solfege/lesson-files/melodic-intervals-10
+share/solfege/lesson-files/melodic-intervals-2
+share/solfege/lesson-files/melodic-intervals-2-3
+share/solfege/lesson-files/melodic-intervals-2-to-8
+share/solfege/lesson-files/melodic-intervals-2int-2-3
+share/solfege/lesson-files/melodic-intervals-3
+share/solfege/lesson-files/melodic-intervals-4-5
+share/solfege/lesson-files/melodic-intervals-4-5-8
+share/solfege/lesson-files/melodic-intervals-6
+share/solfege/lesson-files/melodic-intervals-6-7
+share/solfege/lesson-files/melodic-intervals-7
+share/solfege/lesson-files/melodic-intervals-7-9
+share/solfege/lesson-files/melodic-intervals-9
+share/solfege/lesson-files/melodic-intervals-down
+share/solfege/lesson-files/melodic-intervals-down-10
+share/solfege/lesson-files/melodic-intervals-down-2
+share/solfege/lesson-files/melodic-intervals-down-2-3
+share/solfege/lesson-files/melodic-intervals-down-2-to-8
+share/solfege/lesson-files/melodic-intervals-down-3
+share/solfege/lesson-files/melodic-intervals-down-4-5
+share/solfege/lesson-files/melodic-intervals-down-4-5-8
+share/solfege/lesson-files/melodic-intervals-down-6
+share/solfege/lesson-files/melodic-intervals-down-6-7
+share/solfege/lesson-files/melodic-intervals-down-7
+share/solfege/lesson-files/melodic-intervals-down-7-9
+share/solfege/lesson-files/melodic-intervals-down-9
+share/solfege/lesson-files/melodic-intervals-down-tritonus-7
+share/solfege/lesson-files/melodic-intervals-self-config
+share/solfege/lesson-files/melodic-intervals-tritonus-7
+share/solfege/lesson-files/melodic-intervals-up
+share/solfege/lesson-files/melodic-intervals-up-10
+share/solfege/lesson-files/melodic-intervals-up-2
+share/solfege/lesson-files/melodic-intervals-up-2-3
+share/solfege/lesson-files/melodic-intervals-up-2-to-8
+share/solfege/lesson-files/melodic-intervals-up-3
+share/solfege/lesson-files/melodic-intervals-up-4-5
+share/solfege/lesson-files/melodic-intervals-up-4-5-8
+share/solfege/lesson-files/melodic-intervals-up-6
+share/solfege/lesson-files/melodic-intervals-up-6-7
+share/solfege/lesson-files/melodic-intervals-up-7
+share/solfege/lesson-files/melodic-intervals-up-7-9
+share/solfege/lesson-files/melodic-intervals-up-9
+share/solfege/lesson-files/melodic-intervals-up-tritonus-7
+share/solfege/lesson-files/nameinterval-1
+share/solfege/lesson-files/nameinterval-2
+share/solfege/lesson-files/nameinterval-fifths
+share/solfege/lesson-files/nameinterval-fourths
+share/solfege/lesson-files/nameinterval-octave
+share/solfege/lesson-files/nameinterval-seconds
+share/solfege/lesson-files/nameinterval-sevenths
+share/solfege/lesson-files/nameinterval-sixths
+share/solfege/lesson-files/nameinterval-thirds
+share/solfege/lesson-files/nameinterval-unison
+share/solfege/lesson-files/progression-1
+share/solfege/lesson-files/progression-2
+share/solfege/lesson-files/progression-atte
+share/solfege/lesson-files/progression-x
+share/solfege/lesson-files/rhythm-all
+share/solfege/lesson-files/rhythm-easy
+share/solfege/lesson-files/rhythm-mid
+share/solfege/lesson-files/rhythm-self-config-binary
+share/solfege/lesson-files/rhythm-self-config-ternary
+share/solfege/lesson-files/rhythm-ternary
+share/solfege/lesson-files/rhythmtapping2-self-config-binary
+share/solfege/lesson-files/rhythmtapping2-self-config-ternary
+share/solfege/lesson-files/sc-6tones
+share/solfege/lesson-files/sc-8tones
+share/solfege/lesson-files/sc-beb
+share/solfege/lesson-files/sc-beb-a
+share/solfege/lesson-files/sc-beb-d
+share/solfege/lesson-files/sc-beb-elem
+share/solfege/lesson-files/sc-beb-name
+share/solfege/lesson-files/sc-beb-s
+share/solfege/lesson-files/sc-church
+share/solfege/lesson-files/sc-dha
+share/solfege/lesson-files/sc-dha-a
+share/solfege/lesson-files/sc-dha-d
+share/solfege/lesson-files/sc-dha-elem
+share/solfege/lesson-files/sc-dha-f
+share/solfege/lesson-files/sc-dha-g
+share/solfege/lesson-files/sc-dha-name
+share/solfege/lesson-files/sc-dha-p
+share/solfege/lesson-files/sc-dha-s
+share/solfege/lesson-files/sc-dha-t
+share/solfege/lesson-files/sc-dom
+share/solfege/lesson-files/sc-dom-jazz
+share/solfege/lesson-files/sc-east
+share/solfege/lesson-files/sc-greek
+share/solfege/lesson-files/sc-hal
+share/solfege/lesson-files/sc-hal-jazz
+share/solfege/lesson-files/sc-ham
+share/solfege/lesson-files/sc-ham-a
+share/solfege/lesson-files/sc-ham-d
+share/solfege/lesson-files/sc-ham-elem
+share/solfege/lesson-files/sc-ham-f
+share/solfege/lesson-files/sc-ham-g
+share/solfege/lesson-files/sc-ham-name
+share/solfege/lesson-files/sc-ham-p
+share/solfege/lesson-files/sc-ham-s
+share/solfege/lesson-files/sc-ham-t
+share/solfege/lesson-files/sc-har
+share/solfege/lesson-files/sc-har-a
+share/solfege/lesson-files/sc-har-d
+share/solfege/lesson-files/sc-har-elem
+share/solfege/lesson-files/sc-har-f
+share/solfege/lesson-files/sc-har-g
+share/solfege/lesson-files/sc-har-name
+share/solfege/lesson-files/sc-har-p
+share/solfege/lesson-files/sc-har-s
+share/solfege/lesson-files/sc-har-t
+share/solfege/lesson-files/sc-hum-g
+share/solfege/lesson-files/sc-hun
+share/solfege/lesson-files/sc-hun-a
+share/solfege/lesson-files/sc-hun-d
+share/solfege/lesson-files/sc-hun-elem
+share/solfege/lesson-files/sc-hun-f
+share/solfege/lesson-files/sc-hun-g
+share/solfege/lesson-files/sc-hun-name
+share/solfege/lesson-files/sc-hun-p
+share/solfege/lesson-files/sc-hun-s
+share/solfege/lesson-files/sc-hun-t
+share/solfege/lesson-files/sc-maj
+share/solfege/lesson-files/sc-maj-a
+share/solfege/lesson-files/sc-maj-d
+share/solfege/lesson-files/sc-maj-elem
+share/solfege/lesson-files/sc-maj-f
+share/solfege/lesson-files/sc-maj-g
+share/solfege/lesson-files/sc-maj-name
+share/solfege/lesson-files/sc-maj-p
+share/solfege/lesson-files/sc-maj-px
+share/solfege/lesson-files/sc-maj-s
+share/solfege/lesson-files/sc-maj-t
+share/solfege/lesson-files/sc-mau
+share/solfege/lesson-files/sc-mau-jazz
+share/solfege/lesson-files/sc-mel
+share/solfege/lesson-files/sc-mel-a
+share/solfege/lesson-files/sc-mel-d
+share/solfege/lesson-files/sc-mel-elem
+share/solfege/lesson-files/sc-mel-f
+share/solfege/lesson-files/sc-mel-g
+share/solfege/lesson-files/sc-mel-name
+share/solfege/lesson-files/sc-mel-p
+share/solfege/lesson-files/sc-mel-s
+share/solfege/lesson-files/sc-mel-t
+share/solfege/lesson-files/sc-min
+share/solfege/lesson-files/sc-min-jazz
+share/solfege/lesson-files/sc-nat-g
+share/solfege/lesson-files/sc-nea
+share/solfege/lesson-files/sc-nea-a
+share/solfege/lesson-files/sc-nea-d
+share/solfege/lesson-files/sc-nea-elem
+share/solfege/lesson-files/sc-nea-f
+share/solfege/lesson-files/sc-nea-g
+share/solfege/lesson-files/sc-nea-name
+share/solfege/lesson-files/sc-nea-p
+share/solfege/lesson-files/sc-nea-s
+share/solfege/lesson-files/sc-nea-t
+share/solfege/lesson-files/sc-nem
+share/solfege/lesson-files/sc-nem-a
+share/solfege/lesson-files/sc-nem-d
+share/solfege/lesson-files/sc-nem-elem
+share/solfege/lesson-files/sc-nem-f
+share/solfege/lesson-files/sc-nem-g
+share/solfege/lesson-files/sc-nem-name
+share/solfege/lesson-files/sc-nem-p
+share/solfege/lesson-files/sc-nem-s
+share/solfege/lesson-files/sc-nem-t
+share/solfege/lesson-files/sc-pen
+share/solfege/lesson-files/sc-pen-a
+share/solfege/lesson-files/sc-pen-d
+share/solfege/lesson-files/sc-pen-elem
+share/solfege/lesson-files/sc-pen-g
+share/solfege/lesson-files/sc-pen-name
+share/solfege/lesson-files/sc-pen-s
+share/solfege/lesson-files/sc-plagal
+share/solfege/lesson-files/sc-sim
+share/solfege/lesson-files/sc-sim-a
+share/solfege/lesson-files/sc-sim-d
+share/solfege/lesson-files/sc-sim-elem
+share/solfege/lesson-files/sc-sim-name
+share/solfege/lesson-files/sc-sim-s
+share/solfege/lesson-files/scales
+share/solfege/lesson-files/scales-all
+share/solfege/lesson-files/scales-bebop
+share/solfege/lesson-files/scales-thirds
+share/solfege/lesson-files/share/fanfare.midi
+share/solfege/lesson-files/share/fifth-pure-220.00.wav
+share/solfege/lesson-files/share/fifth-pure-247.5.wav
+share/solfege/lesson-files/share/fifth-pure-293.33.wav
+share/solfege/lesson-files/share/fifth-small-220.00.wav
+share/solfege/lesson-files/share/fifth-small-247.5.wav
+share/solfege/lesson-files/share/fifth-small-293.33.wav
+share/solfege/lesson-files/share/fil1.orc
+share/solfege/lesson-files/share/fil1.sco
+share/solfege/lesson-files/sing-chord-tone
+share/solfege/lesson-files/sing-intervals
+share/solfege/lesson-files/sing-intervals-10
+share/solfege/lesson-files/sing-intervals-2
+share/solfege/lesson-files/sing-intervals-2-3
+share/solfege/lesson-files/sing-intervals-3
+share/solfege/lesson-files/sing-intervals-4-5
+share/solfege/lesson-files/sing-intervals-4-5-8
+share/solfege/lesson-files/sing-intervals-6
+share/solfege/lesson-files/sing-intervals-6-7
+share/solfege/lesson-files/sing-intervals-7
+share/solfege/lesson-files/sing-intervals-7-9
+share/solfege/lesson-files/sing-intervals-9
+share/solfege/lesson-files/sing-intervals-self-config
+share/solfege/lesson-files/sing-intervals-tritonus-7
+share/solfege/lesson-files/sing-the-fifth
+share/solfege/lesson-files/sing-the-root
+share/solfege/lesson-files/sing-the-seventh
+share/solfege/lesson-files/sing-the-third
+share/solfege/lesson-files/singchord-1
+share/solfege/lesson-files/singchord-2
+share/solfege/lesson-files/singchord-3
+share/solfege/lesson-files/singchord-4
+share/solfege/lesson-files/singchord-5
+share/solfege/lesson-files/singchord-6
+share/solfege/lesson-files/singchord-all
+share/solfege/lesson-files/tapping-all
+share/solfege/lesson-files/tapping-easy
+share/solfege/lesson-files/tapping-mid
+share/solfege/lesson-files/three-prog-root
+share/solfege/lesson-files/twelvetone
+share/solfege/lesson-files/two-prog-root
+share/solfege/lesson-files/volkslieder1
+share/solfege/lesson-files/volkslieder2
+share/solfege/mpd/__init__.py
+share/solfege/mpd/_exceptions.py
+share/solfege/mpd/const.py
+share/solfege/mpd/duration.py
+share/solfege/mpd/engravers.py
+share/solfege/mpd/interval.py
+share/solfege/mpd/mfutils.py
+share/solfege/mpd/mpdutils.py
+share/solfege/mpd/musicalpitch.py
+share/solfege/mpd/musicdisplayer.py
+share/solfege/mpd/parser.py
+share/solfege/mpd/rat.py
+share/solfege/mpd/requests.py
+share/solfege/mpd/track.py
+share/solfege/solfege.gtkrc
+share/solfege/soundcard/__init__.py
+share/solfege/soundcard/exporter.py
+share/solfege/soundcard/fakesynth.py
+share/solfege/soundcard/midifilesynth.py
+share/solfege/soundcard/oss_common.py
+share/solfege/soundcard/oss_sequencer.py
+share/solfege/soundcard/oss_sequencer2.py
+share/solfege/soundcard/solfege_c_midi.py
+share/solfege/soundcard/soundcardexceptions.py
+share/solfege/soundcard/synth_common.py
+share/solfege/soundcard/winsynth.py
+share/solfege/src/ElementTree.py
+share/solfege/src/__init__.py
+share/solfege/src/abstract.py
+share/solfege/src/app.py
+share/solfege/src/cfg.py
+share/solfege/src/chord.py
+share/solfege/src/chordvoicing.py
+share/solfege/src/compareintervals.py
+share/solfege/src/configureoutput.py
+share/solfege/src/configwindow.py
+share/solfege/src/const.py
+share/solfege/src/dataparser.py
+share/solfege/src/dictation.py
+share/solfege/src/docviewer.py
+share/solfege/src/elembuilder.py
+share/solfege/src/example.py
+share/solfege/src/exceptiondialog.py
+share/solfege/src/filesystem.py
+share/solfege/src/gpath.py
+share/solfege/src/gu.py
+share/solfege/src/harmonicinterval.py
+share/solfege/src/harmonicprogressiondictation.py
+share/solfege/src/helpbrowser.py
+share/solfege/src/history.py
+share/solfege/src/htmlwidget.py
+share/solfege/src/i18n.py
+share/solfege/src/idbyname.py
+share/solfege/src/identifybpm.py
+share/solfege/src/idtone.py
+share/solfege/src/inputwidgets.py
+share/solfege/src/instrumentselector.py
+share/solfege/src/languages.py
+share/solfege/src/learning_tree_editor.py
+share/solfege/src/lessonfile.py
+share/solfege/src/lessonfile_editor_main.py
+share/solfege/src/lessonfilegui.py
+share/solfege/src/mainwin.py
+share/solfege/src/melodicinterval.py
+share/solfege/src/multipleintervalconfigwidget.py
+share/solfege/src/nameinterval.py
+share/solfege/src/notenamespinbutton.py
+share/solfege/src/osutils.py
+share/solfege/src/pmwiki.py
+share/solfege/src/practisesheetdlg.py
+share/solfege/src/reportbug.py
+share/solfege/src/reportlib.py
+share/solfege/src/rhythm.py
+share/solfege/src/rhythmtapping.py
+share/solfege/src/rhythmtapping2.py
+share/solfege/src/runtime.py
+share/solfege/src/singanswer.py
+share/solfege/src/singchord.py
+share/solfege/src/singinterval.py
+share/solfege/src/specialwidgets.py
+share/solfege/src/statistics.py
+share/solfege/src/statisticsviewer.py
+share/solfege/src/stock.py
+share/solfege/src/testlib.py
+share/solfege/src/tracebackwindow.py
+share/solfege/src/trainingsetdlg.py
+share/solfege/src/tree.py
+share/solfege/src/tuner.py
+share/solfege/src/twelvetone.py
+share/solfege/src/utils.py
+share/solfege/src/uuid.py
+share/solfege/src/winreg.py
+share/solfege/src/xrandom.py
+share/solfege/themes/svg/chord-voicing.svg
+share/solfege/themes/svg/chord.svg
+share/solfege/themes/svg/happyface.svg
+share/solfege/themes/svg/harmonic-interval.svg
+share/solfege/themes/svg/id-by-name.svg
+share/solfege/themes/svg/mal.svg
+share/solfege/themes/svg/melodic-interval.svg
+share/solfege/themes/svg/sadface.svg
+share/solfege/themes/svg/sing-chord.svg
+share/solfege/themes/svg/sing-interval.svg
+share/solfege/themes/svg/solfege.svg
+share/solfege/ui.xml
 share/locale/cs/LC_MESSAGES/solfege.mo
 share/locale/da/LC_MESSAGES/solfege.mo
 share/locale/de/LC_MESSAGES/solfege.mo
@@ -913,28 +913,29 @@ share/locale/pt_BR/LC_MESSAGES/solfege.mo
 share/locale/ru/LC_MESSAGES/solfege.mo
 share/locale/sv/LC_MESSAGES/solfege.mo
 share/locale/tr/LC_MESSAGES/solfege.mo
-@dirrm share/gnome/solfege/themes/svg
-@dirrm share/gnome/solfege/themes
-@dirrm share/gnome/solfege/src
-@dirrm share/gnome/solfege/soundcard
-@dirrm share/gnome/solfege/mpd
-@dirrm share/gnome/solfege/lesson-files/share
-@dirrm share/gnome/solfege/lesson-files/include
-@dirrm share/gnome/solfege/lesson-files/bin
-@dirrm share/gnome/solfege/lesson-files
-@dirrm share/gnome/solfege/help/tr/figures
-@dirrm share/gnome/solfege/help/tr
-@dirrm share/gnome/solfege/help/pt_BR/figures
-@dirrm share/gnome/solfege/help/pt_BR
-@dirrm share/gnome/solfege/help/no/figures
-@dirrm share/gnome/solfege/help/no
-@dirrm share/gnome/solfege/help/fr/figures
-@dirrm share/gnome/solfege/help/fr
-@dirrm share/gnome/solfege/help/C/ly
-@dirrm share/gnome/solfege/help/C/figures
-@dirrm share/gnome/solfege/help/C
-@dirrm share/gnome/solfege/help
-@dirrm share/gnome/solfege/graphics
-@dirrm share/gnome/solfege/feta
-@dirrm share/gnome/solfege/example-lesson-files
-@dirrm share/gnome/solfege
+@dirrm share/solfege/themes/svg
+@dirrm share/solfege/themes
+@dirrm share/solfege/src
+@dirrm share/solfege/soundcard
+@dirrm share/solfege/mpd
+@dirrm share/solfege/lesson-files/share
+@dirrm share/solfege/lesson-files/include
+@dirrm share/solfege/lesson-files/bin
+@dirrm share/solfege/lesson-files
+@dirrm share/solfege/help/tr/figures
+@dirrm share/solfege/help/tr
+@dirrm share/solfege/help/pt_BR/figures
+@dirrm share/solfege/help/pt_BR
+@dirrm share/solfege/help/no/figures
+@dirrm share/solfege/help/no
+@dirrm share/solfege/help/fr/figures
+@dirrm share/solfege/help/fr
+@dirrm share/solfege/help/C/ly
+@dirrm share/solfege/help/C/figures
+@dirrm share/solfege/help/C
+@dirrm share/solfege/help
+@dirrm share/solfege/graphics
+@dirrm share/solfege/feta
+@dirrm share/solfege/example-lesson-files
+@dirrm share/solfege
+@dirrmtry share/applications
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 02b0e4973acd..3b25d746a009 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/sound-juicer/Makefile,v 1.61 2006/10/01 16:32:05 ahze Exp $
+#   $MCom: ports/audio/sound-juicer/Makefile,v 1.71 2007/10/15 00:27:00 marcus Exp $
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	2.16.4
-PORTREVISION=	1
+PORTVERSION=	2.20.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +18,8 @@ COMMENT=	Clean, mean and lean CD ripper for GNOME2
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
-		cdio.7:${PORTSDIR}/sysutils/libcdio
+		cdio.7:${PORTSDIR}/sysutils/libcdio \
+    		tag.5:${PORTSDIR}/audio/taglib
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 0930bee78d7a..cc9d09126b7b 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.16.4.tar.bz2) = bcf1f77027b1d1d4c1667b20c6448122
-SHA256 (gnome2/sound-juicer-2.16.4.tar.bz2) = db90283d1eca9e7a1cc986a13b222ad60f3b48333bce9f275dd3861c11124371
-SIZE (gnome2/sound-juicer-2.16.4.tar.bz2) = 1270126
+MD5 (gnome2/sound-juicer-2.20.1.tar.bz2) = cea3c67215c99acf513ee7ea4b5eba7b
+SHA256 (gnome2/sound-juicer-2.20.1.tar.bz2) = 6ac84544386ef7f690330d7f92f6c2f64da752c0f5cd60501a792b23f325a9ab
+SIZE (gnome2/sound-juicer-2.20.1.tar.bz2) = 1412335
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 5310f1442d23..9b4c1e883cb3 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -1,10 +1,15 @@
 bin/sound-juicer
-share/gnome/applications/sound-juicer.desktop
+share/applications/sound-juicer.desktop
 share/gnome/help/sound-juicer/C/fdl-appendix.xml
 share/gnome/help/sound-juicer/C/figures/prefs.png
 share/gnome/help/sound-juicer/C/figures/startup.png
 share/gnome/help/sound-juicer/C/legal.xml
 share/gnome/help/sound-juicer/C/sound-juicer.xml
+share/gnome/help/sound-juicer/de/fdl-appendix.xml
+share/gnome/help/sound-juicer/de/figures/prefs.png
+share/gnome/help/sound-juicer/de/figures/startup.png
+share/gnome/help/sound-juicer/de/legal.xml
+share/gnome/help/sound-juicer/de/sound-juicer.xml
 share/gnome/help/sound-juicer/el/fdl-appendix.xml
 share/gnome/help/sound-juicer/el/figures/prefs.png
 share/gnome/help/sound-juicer/el/figures/startup.png
@@ -30,6 +35,11 @@ share/gnome/help/sound-juicer/nl/figures/prefs.png
 share/gnome/help/sound-juicer/nl/figures/startup.png
 share/gnome/help/sound-juicer/nl/legal.xml
 share/gnome/help/sound-juicer/nl/sound-juicer.xml
+share/gnome/help/sound-juicer/oc/fdl-appendix.xml
+share/gnome/help/sound-juicer/oc/figures/prefs.png
+share/gnome/help/sound-juicer/oc/figures/startup.png
+share/gnome/help/sound-juicer/oc/legal.xml
+share/gnome/help/sound-juicer/oc/sound-juicer.xml
 share/gnome/help/sound-juicer/sv/fdl-appendix.xml
 share/gnome/help/sound-juicer/sv/figures/prefs.png
 share/gnome/help/sound-juicer/sv/figures/startup.png
@@ -40,17 +50,6 @@ share/gnome/help/sound-juicer/uk/figures/prefs.png
 share/gnome/help/sound-juicer/uk/figures/startup.png
 share/gnome/help/sound-juicer/uk/legal.xml
 share/gnome/help/sound-juicer/uk/sound-juicer.xml
-share/gnome/omf/sound-juicer/sound-juicer-C.omf
-share/gnome/omf/sound-juicer/sound-juicer-el.omf
-share/gnome/omf/sound-juicer/sound-juicer-en_GB.omf
-share/gnome/omf/sound-juicer/sound-juicer-es.omf
-share/gnome/omf/sound-juicer/sound-juicer-fr.omf
-share/gnome/omf/sound-juicer/sound-juicer-nl.omf
-share/gnome/omf/sound-juicer/sound-juicer-sv.omf
-share/gnome/omf/sound-juicer/sound-juicer-uk.omf
-share/gnome/sound-juicer/sj-play.png
-share/gnome/sound-juicer/sj-record.png
-share/gnome/sound-juicer/sound-juicer.glade
 share/icons/hicolor/16x16/apps/sound-juicer.png
 share/icons/hicolor/22x22/apps/sound-juicer.png
 share/icons/hicolor/24x24/apps/sound-juicer.png
@@ -58,6 +57,7 @@ share/icons/hicolor/scalable/apps/sound-juicer.svg
 share/locale/ar/LC_MESSAGES/sound-juicer.mo
 share/locale/az/LC_MESSAGES/sound-juicer.mo
 share/locale/be/LC_MESSAGES/sound-juicer.mo
+share/locale/be@latin/LC_MESSAGES/sound-juicer.mo
 share/locale/bg/LC_MESSAGES/sound-juicer.mo
 share/locale/bn/LC_MESSAGES/sound-juicer.mo
 share/locale/bn_IN/LC_MESSAGES/sound-juicer.mo
@@ -99,6 +99,7 @@ share/locale/nb/LC_MESSAGES/sound-juicer.mo
 share/locale/ne/LC_MESSAGES/sound-juicer.mo
 share/locale/nl/LC_MESSAGES/sound-juicer.mo
 share/locale/nn/LC_MESSAGES/sound-juicer.mo
+share/locale/oc/LC_MESSAGES/sound-juicer.mo
 share/locale/or/LC_MESSAGES/sound-juicer.mo
 share/locale/pa/LC_MESSAGES/sound-juicer.mo
 share/locale/pl/LC_MESSAGES/sound-juicer.mo
@@ -107,6 +108,7 @@ share/locale/pt_BR/LC_MESSAGES/sound-juicer.mo
 share/locale/ro/LC_MESSAGES/sound-juicer.mo
 share/locale/ru/LC_MESSAGES/sound-juicer.mo
 share/locale/rw/LC_MESSAGES/sound-juicer.mo
+share/locale/si/LC_MESSAGES/sound-juicer.mo
 share/locale/sk/LC_MESSAGES/sound-juicer.mo
 share/locale/sl/LC_MESSAGES/sound-juicer.mo
 share/locale/sq/LC_MESSAGES/sound-juicer.mo
@@ -123,22 +125,39 @@ share/locale/xh/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_HK/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
-@dirrm share/gnome/sound-juicer
-@dirrm share/gnome/omf/sound-juicer
+share/omf/sound-juicer/sound-juicer-C.omf
+share/omf/sound-juicer/sound-juicer-de.omf
+share/omf/sound-juicer/sound-juicer-el.omf
+share/omf/sound-juicer/sound-juicer-en_GB.omf
+share/omf/sound-juicer/sound-juicer-es.omf
+share/omf/sound-juicer/sound-juicer-fr.omf
+share/omf/sound-juicer/sound-juicer-nl.omf
+share/omf/sound-juicer/sound-juicer-oc.omf
+share/omf/sound-juicer/sound-juicer-sv.omf
+share/omf/sound-juicer/sound-juicer-uk.omf
+%%DATADIR%%/sj-play.png
+%%DATADIR%%/sj-record.png
+%%DATADIR%%/sound-juicer.glade
+@dirrm %%DATADIR%%
+@dirrm share/omf/sound-juicer
 @dirrm share/gnome/help/sound-juicer/uk/figures
 @dirrm share/gnome/help/sound-juicer/uk
 @dirrm share/gnome/help/sound-juicer/sv/figures
 @dirrm share/gnome/help/sound-juicer/sv
+@dirrm share/gnome/help/sound-juicer/oc/figures
+@dirrm share/gnome/help/sound-juicer/oc
 @dirrm share/gnome/help/sound-juicer/nl/figures
 @dirrm share/gnome/help/sound-juicer/nl
 @dirrm share/gnome/help/sound-juicer/fr/figures
 @dirrm share/gnome/help/sound-juicer/fr
 @dirrm share/gnome/help/sound-juicer/es/figures
 @dirrm share/gnome/help/sound-juicer/es
-@dirrm share/gnome/help/sound-juicer/el/figures
-@dirrm share/gnome/help/sound-juicer/el
 @dirrm share/gnome/help/sound-juicer/en_GB/figures
 @dirrm share/gnome/help/sound-juicer/en_GB
+@dirrm share/gnome/help/sound-juicer/el/figures
+@dirrm share/gnome/help/sound-juicer/el
+@dirrm share/gnome/help/sound-juicer/de/figures
+@dirrm share/gnome/help/sound-juicer/de
 @dirrm share/gnome/help/sound-juicer/C/figures
 @dirrm share/gnome/help/sound-juicer/C
 @dirrm share/gnome/help/sound-juicer
@@ -148,11 +167,18 @@ share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@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/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 5622a91fef52..76a9b4c234b3 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	soundtracker
 PORTVERSION=	0.6.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.soundtracker.org/dl/%SUBDIR%/
 MASTER_SITE_SUBDIR=	v${PORTVERSION:R}
@@ -44,7 +44,6 @@ CONFIGURE_ARGS+=	--enable-asm
 .if defined(WITH_GNOME)
 USE_GNOME+=	gnomelibs gnomeprefix
 CONFIGURE_ARGS+=	--enable-gnome
-DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 .else
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
diff --git a/audio/soundtracker/files/patch-app::Makefile.in b/audio/soundtracker/files/patch-app::Makefile.in
index 6a9fc7bb5e7b..b77dd5b8b80a 100644
--- a/audio/soundtracker/files/patch-app::Makefile.in
+++ b/audio/soundtracker/files/patch-app::Makefile.in
@@ -5,11 +5,11 @@
  stdir = $(datadir)/soundtracker
  
 -#INCLUDES = -DDATADIR=\"$(stdir)\" \
--#	-DLOCALEDIR=\"$(prefix)/share/locale\"
--INCLUDES = -DLOCALEDIR=\"$(prefix)/share/locale\"
+-#	-DLOCALEDIR=\"$(datadir)/locale\"
+-INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
 +INCLUDES = -DDATADIR=\"$(stdir)\" \
-+	-DLOCALEDIR=\"$(prefix)/share/locale\"
-+#INCLUDES = -DLOCALEDIR=\"$(prefix)/share/locale\"
++	-DLOCALEDIR=\"$(datadir)/locale\"
++#INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
  subdir = app
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/audio/soundtracker/pkg-plist b/audio/soundtracker/pkg-plist
index e02d36fa83fa..c8ce1e41931a 100644
--- a/audio/soundtracker/pkg-plist
+++ b/audio/soundtracker/pkg-plist
@@ -32,7 +32,7 @@ share/pixmaps/soundtracker.xpm
 @dirrm %%DATADIR%%
 %%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/rw
-%%NLS%%@dirrm share/locale/en@quot/LC_MESSAGES
-%%NLS%%@dirrm share/locale/en@quot
-%%NLS%%@dirrm share/locale/en@boldquot/LC_MESSAGES
-%%NLS%%@dirrm share/locale/en@boldquot
+%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en@quot
+%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en@boldquot
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index fd3ab322db8f..b81254a014f3 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		streamtuner
 PORTVERSION=		0.99.99
-PORTREVISION=		7
+PORTREVISION=		9
 CATEGORIES=		audio www
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,14 +15,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		jylefort@FreeBSD.org
 COMMENT=		A GTK+ stream directory browser
 
-BUILD_DEPENDS=		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS=		rarian-sk-config:${PORTSDIR}/textproc/rarian
 LIB_DEPENDS=		curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_XLIB=		yes
 USE_GNOME=		gtk20 gnomehack gnomeprefix
 USE_GMAKE=		yes
-GNU_CONFIGURE=	yes
+INSTALLS_OMF=		yes
+GNU_CONFIGURE=		yes
 USE_GETOPT_LONG=	yes
 CPPFLAGS=		-I${LOCALBASE}/include
 LDFLAGS=		-L${LOCALBASE}/lib
@@ -85,5 +86,7 @@ USE_GNOME+=		pygtk2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[(]datadir[)]/help|(datadir)/gnome/help|g' \
+		${WRKSRC}/help/C/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/audio/streamtuner/pkg-plist b/audio/streamtuner/pkg-plist
index 49b9461ba2df..4aea575d4a33 100644
--- a/audio/streamtuner/pkg-plist
+++ b/audio/streamtuner/pkg-plist
@@ -24,6 +24,7 @@ include/streamtuner/streamtuner.h
 %%SHOUTCAST%%lib/streamtuner/plugins/shoutcast.so
 %%XIPH%%lib/streamtuner/plugins/xiph.so
 libdata/pkgconfig/streamtuner.pc
+share/applications/streamtuner.desktop
 share/doc/streamtuner/api-reference.html
 share/doc/streamtuner/ch01s02.html
 share/doc/streamtuner/home.png
@@ -53,58 +54,56 @@ share/doc/streamtuner/streamtuner-st-util-api.html
 share/doc/streamtuner/streamtuner-st-version-api.html
 share/doc/streamtuner/streamtuner.devhelp
 share/doc/streamtuner/up.png
-share/gnome/applications/streamtuner.desktop
 share/gnome/help/streamtuner/C/documentation-license.xml
 share/gnome/help/streamtuner/C/figures/main-window.png
 share/gnome/help/streamtuner/C/software-license.xml
 share/gnome/help/streamtuner/C/streamtuner.xml
-share/gnome/omf/streamtuner/streamtuner-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/streamtuner/streamtuner-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/streamtuner.png
-share/gnome/streamtuner/ui/applications.png
-share/gnome/streamtuner/ui/bookmarks.png
-share/gnome/streamtuner/ui/browse.png
-share/gnome/streamtuner/ui/category-open-running.png
-share/gnome/streamtuner/ui/category-open.png
-share/gnome/streamtuner/ui/category-running.png
-share/gnome/streamtuner/ui/category.png
-%%LIVE365%%share/gnome/streamtuner/ui/live365.png
-%%LOCAL%%share/gnome/streamtuner/ui/local.png
-share/gnome/streamtuner/ui/logo.png
-share/gnome/streamtuner/ui/main-category-running.png
-share/gnome/streamtuner/ui/main-category.png
-share/gnome/streamtuner/ui/preselections.png
-%%PYTHON%%share/gnome/streamtuner/ui/python.png
-share/gnome/streamtuner/ui/record.png
-share/gnome/streamtuner/ui/search-category-running.png
-share/gnome/streamtuner/ui/search-category.png
-share/gnome/streamtuner/ui/search.png
-%%SHOUTCAST%%share/gnome/streamtuner/ui/shoutcast.png
-share/gnome/streamtuner/ui/streamtuner.png
-share/gnome/streamtuner/ui/tune-in.png
-%%XIPH%%share/gnome/streamtuner/ui/xiph.png
-%%PYTHON%%share/gnome/streamtuner/python/icons/basic.ch.png
-%%PYTHON%%share/gnome/streamtuner/python/icons/google-stations.png
-%%PYTHON%%share/gnome/streamtuner/python/icons/punkcast.com.png
-%%PYTHON%%share/gnome/streamtuner/python/scripts/basic.ch.py
-%%PYTHON%%share/gnome/streamtuner/python/scripts/google-stations.py
-%%PYTHON%%share/gnome/streamtuner/python/scripts/punkcast.com.py
 share/locale/de/LC_MESSAGES/streamtuner.mo
 share/locale/fr/LC_MESSAGES/streamtuner.mo
 share/locale/hu/LC_MESSAGES/streamtuner.mo
 share/locale/ja/LC_MESSAGES/streamtuner.mo
 share/locale/pt/LC_MESSAGES/streamtuner.mo
-@dirrm include/streamtuner
-@dirrm lib/streamtuner/plugins
-@dirrm lib/streamtuner
-@dirrm share/doc/streamtuner
+share/omf/streamtuner/streamtuner-C.omf
+share/pixmaps/streamtuner.png
+share/streamtuner/ui/applications.png
+share/streamtuner/ui/bookmarks.png
+share/streamtuner/ui/browse.png
+share/streamtuner/ui/category-open-running.png
+share/streamtuner/ui/category-open.png
+share/streamtuner/ui/category-running.png
+share/streamtuner/ui/category.png
+%%LIVE365%%share/streamtuner/ui/live365.png
+%%LOCAL%%share/streamtuner/ui/local.png
+share/streamtuner/ui/logo.png
+share/streamtuner/ui/main-category-running.png
+share/streamtuner/ui/main-category.png
+share/streamtuner/ui/preselections.png
+%%PYTHON%%share/streamtuner/ui/python.png
+share/streamtuner/ui/record.png
+share/streamtuner/ui/search-category-running.png
+share/streamtuner/ui/search-category.png
+share/streamtuner/ui/search.png
+%%SHOUTCAST%%share/streamtuner/ui/shoutcast.png
+share/streamtuner/ui/streamtuner.png
+share/streamtuner/ui/tune-in.png
+%%XIPH%%share/streamtuner/ui/xiph.png
+%%PYTHON%%share/streamtuner/python/icons/basic.ch.png
+%%PYTHON%%share/streamtuner/python/icons/google-stations.png
+%%PYTHON%%share/streamtuner/python/icons/punkcast.com.png
+%%PYTHON%%share/streamtuner/python/scripts/basic.ch.py
+%%PYTHON%%share/streamtuner/python/scripts/google-stations.py
+%%PYTHON%%share/streamtuner/python/scripts/punkcast.com.py
+@dirrm share/streamtuner/ui
+%%PYTHON%%@dirrm share/streamtuner/python/scripts
+%%PYTHON%%@dirrm share/streamtuner/python/icons
+%%PYTHON%%@dirrm share/streamtuner/python
+@dirrm share/streamtuner
+@dirrm share/omf/streamtuner
 @dirrm share/gnome/help/streamtuner/C/figures
 @dirrm share/gnome/help/streamtuner/C
 @dirrm share/gnome/help/streamtuner
-@dirrm share/gnome/omf/streamtuner
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/streamtuner/streamtuner-C.omf 2>/dev/null || /usr/bin/true
-@dirrm share/gnome/streamtuner/ui
-%%PYTHON%%@dirrm share/gnome/streamtuner/python/icons
-%%PYTHON%%@dirrm share/gnome/streamtuner/python/scripts
-%%PYTHON%%@dirrm share/gnome/streamtuner/python
-@dirrm share/gnome/streamtuner
+@dirrm share/doc/streamtuner
+@dirrm lib/streamtuner/plugins
+@dirrm lib/streamtuner
+@dirrm include/streamtuner
+@dirrmtry share/applications
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index cf5312762c0f..65e916cb55c5 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -6,37 +6,36 @@
 #
 
 PORTNAME=	sweep
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.1
+PORTREVISION=	5
 CATEGORIES=	audio gnome
-MASTER_SITES=	SF
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A sound editor for the GNOME/GTK 2.0 desktop
 
-LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
+LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		speex.1:${PORTSDIR}/audio/speex
+		speex.1:${PORTSDIR}/audio/speex \
+		mad.2:${PORTSDIR}/audio/mad
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnometarget gtk20
+USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
+USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-extralibdir=${LOCALBASE}/lib \
 		--with-extraincdir=${LOCALBASE}/include \
-		--with-vorbis-libraries=${LOCALBASE}/lib \
-		--with-vorbis-includes=${LOCALBASE}/include/vorbis \
-		--with-ogg-libraries=${LOCALBASE}/lib \
-		--with-ogg-includes=${LOCALBASE}/include/ogg
+		--with-vorbis=${LOCALBASE}/lib \
+		--with-vorbis=${LOCALBASE}/include/vorbis \
+		--with-ogg=${LOCALBASE}/lib \
+		--with-ogg=${LOCALBASE}/include/ogg
 
 MAN1=		sweep.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^ac_enable_alsa=yes|ac_enable_alsa=no|g ; \
-		 s|$${datadir}|$${datarootdir}|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/audio/sweep/distinfo b/audio/sweep/distinfo
index a73361a03944..59f323918825 100644
--- a/audio/sweep/distinfo
+++ b/audio/sweep/distinfo
@@ -1,3 +1,3 @@
-MD5 (sweep-0.9.2.tar.bz2) = 285e04b950dda85639f13aaac86153a0
-SHA256 (sweep-0.9.2.tar.bz2) = 33f8a57b38d141e4892da807be8f4e0f99869f1414977a5e36715d1e6d673b77
-SIZE (sweep-0.9.2.tar.bz2) = 885375
+MD5 (sweep-0.9.1.tar.bz2) = 7c346e28ff09c4a4f529a607ffd165f9
+SHA256 (sweep-0.9.1.tar.bz2) = 68ba9d32d3c3ed72d8d91a9aa8a845ec4c79aaf1da67c4db2ba705d9bddc925f
+SIZE (sweep-0.9.1.tar.bz2) = 898641
diff --git a/audio/sweep/pkg-plist b/audio/sweep/pkg-plist
index 40273840278a..93c9fef8d5e4 100644
--- a/audio/sweep/pkg-plist
+++ b/audio/sweep/pkg-plist
@@ -9,13 +9,27 @@ include/sweep/sweep_typeconvert.h
 include/sweep/sweep_types.h
 include/sweep/sweep_undo.h
 include/sweep/sweep_version.h
+lib/sweep/libbyenergy.a
+lib/sweep/libbyenergy.la
 lib/sweep/libbyenergy.so
+lib/sweep/libecho.a
+lib/sweep/libecho.la
 lib/sweep/libecho.so
+lib/sweep/libfade.a
+lib/sweep/libfade.la
 lib/sweep/libfade.so
+lib/sweep/libladspameta.a
+lib/sweep/libladspameta.la
 lib/sweep/libladspameta.so
+lib/sweep/libnormalise.a
+lib/sweep/libnormalise.la
 lib/sweep/libnormalise.so
+lib/sweep/libreverse.a
+lib/sweep/libreverse.la
 lib/sweep/libreverse.so
 share/applications/sweep.desktop
+share/pixmaps/sweep.svg
+share/sweep/sweep_logo.ppm
 share/locale/de/LC_MESSAGES/sweep.mo
 share/locale/el/LC_MESSAGES/sweep.mo
 share/locale/en_AU/LC_MESSAGES/sweep.mo
@@ -25,9 +39,9 @@ share/locale/hu/LC_MESSAGES/sweep.mo
 share/locale/it/LC_MESSAGES/sweep.mo
 share/locale/pl/LC_MESSAGES/sweep.mo
 share/locale/ru/LC_MESSAGES/sweep.mo
-share/pixmaps/sweep.svg
-%%DATADIR%%/sweep_splash.png
-@dirrm %%DATADIR%%
+@dirrm share/sweep
 @dirrm lib/sweep
 @dirrm include/sweep
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/applications
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 2e0bd06d497d..f985ef1330ca 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -3,10 +3,11 @@
 # Whom:				Tilman Linneweh <arved@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/terminatorx/Makefile,v 1.6 2007/08/04 03:51:28 marcus Exp $
 
 PORTNAME=	terminatorx
 PORTVERSION=	3.82
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://terminatorx.org/dist/
 DISTNAME=	terminatorX-${PORTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Realtime audio synthesizer that allows you to "scratch" on audio data
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
-		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+		rarian-sk-config:${PORTSDIR}/textproc/rarian
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		lrdf.2:${PORTSDIR}/textproc/liblrdf \
 		jack.0:${PORTSDIR}/audio/jack
@@ -78,11 +79,11 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/terminatorX.1 ${MANPREFIX}/man/man1
 .for file in terminatorX-app.png terminatorX-mime.png
 	${INSTALL_DATA} ${WRKSRC}/gnome-support/${file} \
-		${PREFIX}/share/gnome/pixmaps
+		${PREFIX}/share/pixmaps
 .endfor
 .for file in terminatorX.mime terminatorX.keys
 	${INSTALL_DATA} ${WRKSRC}/gnome-support/${file} \
-		${PREFIX}/share/gnome/mime-info
+		${PREFIX}/share/mime-info
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/gnome-support/terminatorX.desktop \
 		${PREFIX}/share/gnome/apps/Multimedia
@@ -92,9 +93,9 @@ do-install:
 	@${MKDIR} ${PREFIX}/share/gnome/help/terminatorX/C/figures
 	${INSTALL_DATA} ${WRKSRC}/doc/terminatorX-manual/C/figures/signalflow.png \
 		${PREFIX}/share/gnome/help/terminatorX/C/figures
-	@${MKDIR} ${PREFIX}/share/gnome/omf/terminatorX
+	@${MKDIR} ${PREFIX}/share/omf/terminatorX
 	${INSTALL_DATA} ${WRKSRC}/doc/terminatorX-manual/C/terminatorX-manual-C.omf \
-		${PREFIX}/share/gnome/omf/terminatorX/terminatorX-C.omf
-	@scrollkeeper-install -q ${PREFIX}/share/gnome/omf/terminatorX/terminatorX-C.omf 2>/dev/null || ${TRUE}
+		${PREFIX}/share/omf/terminatorX/terminatorX-C.omf
+	@scrollkeeper-install -q ${PREFIX}/share/omf/terminatorX/terminatorX-C.omf 2>/dev/null || ${TRUE}
 
 .include <bsd.port.post.mk>
diff --git a/audio/terminatorx/pkg-plist b/audio/terminatorx/pkg-plist
index 410c5fde1a74..1b64bfbd895a 100644
--- a/audio/terminatorx/pkg-plist
+++ b/audio/terminatorx/pkg-plist
@@ -2,12 +2,12 @@ bin/terminatorX
 share/gnome/apps/Multimedia/terminatorX.desktop
 share/gnome/help/terminatorX/C/terminatorX.xml
 share/gnome/help/terminatorX/C/figures/signalflow.png
-share/gnome/mime-info/terminatorX.keys
-share/gnome/mime-info/terminatorX.mime
-share/gnome/omf/terminatorX/terminatorX-C.omf
-share/gnome/pixmaps/terminatorX-app.png
-share/gnome/pixmaps/terminatorX-mime.png
-@dirrm share/gnome/omf/terminatorX
+share/mime-info/terminatorX.keys
+share/mime-info/terminatorX.mime
+share/omf/terminatorX/terminatorX-C.omf
+share/pixmaps/terminatorX-app.png
+share/pixmaps/terminatorX-mime.png
+@dirrm share/omf/terminatorX
 @dirrm share/gnome/help/terminatorX/C/figures
 @dirrm share/gnome/help/terminatorX/C
 @dirrm share/gnome/help/terminatorX
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index c643fdc10d98..bed1ea1480a8 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yamt
 PORTVERSION=	0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
diff --git a/audio/yamt/pkg-plist b/audio/yamt/pkg-plist
index 1434c0c978e9..65e9eb0b5b41 100644
--- a/audio/yamt/pkg-plist
+++ b/audio/yamt/pkg-plist
@@ -1,7 +1,7 @@
 bin/yamt
 share/gnome/apps/Applications/yamt.desktop
-share/gnome/pixmaps/yamt-logo.png
-share/gnome/pixmaps/yamt-icon.png
+share/pixmaps/yamt-logo.png
+share/pixmaps/yamt-icon.png
 share/locale/de/LC_MESSAGES/yamt.mo
 share/locale/fr/LC_MESSAGES/yamt.mo
 share/locale/hu/LC_MESSAGES/yamt.mo
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 7913feeca911..5f564bf31ebd 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Anders Andersson <anders@hack.org>
 #
 # $FreeBSD$
-#    $MCom: ports/cad/oregano/Makefile,v 1.7 2006/10/10 05:25:08 ahze Exp $
+#   $MCom: ports/cad/oregano/Makefile,v 1.9 2007/07/23 19:25:26 mezz Exp $
+#
 
 PORTNAME=	oregano
 PORTVERSION=	0.60.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad gnome
 MASTER_SITES=	http://gforge.lug.fi.uba.ar/frs/download.php/84/
 
@@ -27,12 +28,7 @@ INSTALLS_OMF=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|-Wall|${CFLAGS}|g ; \
-		 s|'/share'|'/share/gnome'|g ; \
-		 s|'share/applications'|'share/gnome/applications'|g ; \
-		 s|'share/mime-info'|'share/gnome/mime-info'|g" ${WRKSRC}/SConstruct
-	@${FIND} ${WRKSRC} -name "SConscript" | ${XARGS} ${REINPLACE_CMD} -e \
-		"s|share/oregano|share/gnome/oregano|g"
+	@${REINPLACE_CMD} -e "s|-Wall|${CFLAGS}|g" ${WRKSRC}/SConstruct
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/oregano
@@ -40,11 +36,11 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/gnome/help/oregano/${lang}
 	${INSTALL_DATA} ${WRKSRC}/help/${lang}/*.xml \
 		${PREFIX}/share/gnome/help/oregano/${lang}
-	@${MKDIR} ${PREFIX}/share/gnome/omf/oregano
+	@${MKDIR} ${PREFIX}/share/omf/oregano
 	${INSTALL_DATA} ${WRKSRC}/help/${lang}/*.omf \
-		${PREFIX}/share/gnome/omf/oregano
+		${PREFIX}/share/omf/oregano
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/gnome-oregano.svg \
-		${PREFIX}/share/gnome/pixmaps/gnome-oregano.svg
+		${PREFIX}/share/pixmaps/gnome-oregano.svg
 
 .include <bsd.port.post.mk>
diff --git a/cad/oregano/pkg-plist b/cad/oregano/pkg-plist
index f31d00e576dd..5672869c7b25 100644
--- a/cad/oregano/pkg-plist
+++ b/cad/oregano/pkg-plist
@@ -1,58 +1,58 @@
 bin/oregano
-share/gnome/applications/oregano.desktop
+share/applications/oregano.desktop
 share/gnome/help/oregano/C/legal.xml
 share/gnome/help/oregano/C/oregano.xml
 share/gnome/help/oregano/es/legal.xml
 share/gnome/help/oregano/es/oregano.xml
 share/gnome/help/oregano/fr/legal.xml
 share/gnome/help/oregano/fr/oregano.xml
-share/gnome/mime-info/oregano.keys
-share/gnome/mime-info/oregano.mime
-share/gnome/omf/oregano/oregano-C.omf
-share/gnome/omf/oregano/oregano-es.omf
-share/gnome/omf/oregano/oregano-fr.omf
-share/gnome/oregano/dialogs/clamp-properties-dialog.glade2
-share/gnome/oregano/dialogs/log-window.glade2
-share/gnome/oregano/dialogs/page-properties.glade2
-share/gnome/oregano/dialogs/part-browser.glade2
-share/gnome/oregano/dialogs/part-properties-dialog.glade2
-share/gnome/oregano/dialogs/plot-add-function.glade2
-share/gnome/oregano/dialogs/plot-export.glade2
-share/gnome/oregano/dialogs/plot-window.glade2
-share/gnome/oregano/dialogs/properties.glade2
-share/gnome/oregano/dialogs/settings.glade2
-share/gnome/oregano/dialogs/sim-settings.glade2
-share/gnome/oregano/dialogs/simulation.glade2
-share/gnome/oregano/dialogs/splash.glade2
-share/gnome/oregano/dialogs/splash.xpm
-share/gnome/oregano/dialogs/textbox-properties-dialog.glade2
-share/gnome/oregano/dialogs/view-netlist.glade2
-share/gnome/oregano/examples/Full-wave bridge rectifier.oregano
-share/gnome/oregano/examples/carga_capacitor.oregano
-share/gnome/oregano/examples/opamp.oregano
-share/gnome/oregano/examples/opamp_ideal.oregano
-share/gnome/oregano/examples/pasa_altos.oregano
-share/gnome/oregano/examples/simple.oregano
-share/gnome/oregano/examples/simple2.oregano
-share/gnome/oregano/libraries/cmos.oreglib
-share/gnome/oregano/libraries/cpu.oreglib
-share/gnome/oregano/libraries/default.oreglib
-share/gnome/oregano/libraries/interface.oreglib
-share/gnome/oregano/libraries/linear.oreglib
-share/gnome/oregano/libraries/memory.oreglib
-share/gnome/oregano/libraries/miscellaneous.oreglib
-share/gnome/oregano/libraries/opamplib.oreglib
-share/gnome/oregano/libraries/peripheral.oreglib
-share/gnome/oregano/libraries/power.oreglib
-share/gnome/oregano/libraries/ttl.oreglib
-share/gnome/oregano/models/12AX7A.model
-share/gnome/oregano/models/1N750.model
-share/gnome/oregano/models/DiodeBridge.model
-share/gnome/oregano/models/NPN.model
-share/gnome/oregano/models/PNP.model
-share/gnome/oregano/models/TLC555.model
-share/gnome/oregano/models/UA741.model
-share/gnome/pixmaps/gnome-oregano.svg
+share/mime-info/oregano.keys
+share/mime-info/oregano.mime
+share/omf/oregano/oregano-C.omf
+share/omf/oregano/oregano-es.omf
+share/omf/oregano/oregano-fr.omf
+share/oregano/dialogs/clamp-properties-dialog.glade2
+share/oregano/dialogs/log-window.glade2
+share/oregano/dialogs/page-properties.glade2
+share/oregano/dialogs/part-browser.glade2
+share/oregano/dialogs/part-properties-dialog.glade2
+share/oregano/dialogs/plot-add-function.glade2
+share/oregano/dialogs/plot-export.glade2
+share/oregano/dialogs/plot-window.glade2
+share/oregano/dialogs/properties.glade2
+share/oregano/dialogs/settings.glade2
+share/oregano/dialogs/sim-settings.glade2
+share/oregano/dialogs/simulation.glade2
+share/oregano/dialogs/splash.glade2
+share/oregano/dialogs/splash.xpm
+share/oregano/dialogs/textbox-properties-dialog.glade2
+share/oregano/dialogs/view-netlist.glade2
+share/oregano/examples/Full-wave bridge rectifier.oregano
+share/oregano/examples/carga_capacitor.oregano
+share/oregano/examples/opamp.oregano
+share/oregano/examples/opamp_ideal.oregano
+share/oregano/examples/pasa_altos.oregano
+share/oregano/examples/simple.oregano
+share/oregano/examples/simple2.oregano
+share/oregano/libraries/cmos.oreglib
+share/oregano/libraries/cpu.oreglib
+share/oregano/libraries/default.oreglib
+share/oregano/libraries/interface.oreglib
+share/oregano/libraries/linear.oreglib
+share/oregano/libraries/memory.oreglib
+share/oregano/libraries/miscellaneous.oreglib
+share/oregano/libraries/opamplib.oreglib
+share/oregano/libraries/peripheral.oreglib
+share/oregano/libraries/power.oreglib
+share/oregano/libraries/ttl.oreglib
+share/oregano/models/12AX7A.model
+share/oregano/models/1N750.model
+share/oregano/models/DiodeBridge.model
+share/oregano/models/NPN.model
+share/oregano/models/PNP.model
+share/oregano/models/TLC555.model
+share/oregano/models/UA741.model
+share/pixmaps/gnome-oregano.svg
 share/locale/ca/LC_MESSAGES/oregano.mo
 share/locale/de/LC_MESSAGES/oregano.mo
 share/locale/es/LC_MESSAGES/oregano.mo
@@ -65,15 +65,16 @@ share/locale/ro/LC_MESSAGES/oregano.mo
 share/locale/ru/LC_MESSAGES/oregano.mo
 share/locale/sv/LC_MESSAGES/oregano.mo
 share/mime/packages/oregano.xml
-@dirrm share/gnome/oregano/models
-@dirrm share/gnome/oregano/libraries
-@dirrm share/gnome/oregano/examples
-@dirrm share/gnome/oregano/dialogs
-@dirrm share/gnome/oregano
-@dirrm share/gnome/omf/oregano
+@dirrm share/oregano/models
+@dirrm share/oregano/libraries
+@dirrm share/oregano/examples
+@dirrm share/oregano/dialogs
+@dirrm share/oregano
+@dirrm share/omf/oregano
 @dirrm share/gnome/help/oregano/fr
 @dirrm share/gnome/help/oregano/es
 @dirrm share/gnome/help/oregano/C
 @dirrm share/gnome/help/oregano
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/chinese/srecite/Makefile b/chinese/srecite/Makefile
index 8f4af8587f6a..6631dafe8489 100644
--- a/chinese/srecite/Makefile
+++ b/chinese/srecite/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	srecite
 PORTVERSION=	0.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese textproc
 MASTER_SITES=	SF
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -25,10 +25,10 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 
-WORDBOOKS_PATH=	${PREFIX}/share/gnome/${PORTNAME}/wordbooks
+WORDBOOKS_PATH=	${PREFIX}/share/${PORTNAME}/wordbooks
 
 post-install:
 	cd ${WRKDIR}/wordbooks && ${INSTALL_DATA} * ${WORDBOOKS_PATH}
-	${INSTALL_DATA} ${FILESDIR}/srecite.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${FILESDIR}/srecite.desktop ${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/chinese/srecite/pkg-plist b/chinese/srecite/pkg-plist
index 3016a5d012d6..922fd81069a9 100644
--- a/chinese/srecite/pkg-plist
+++ b/chinese/srecite/pkg-plist
@@ -1,124 +1,125 @@
 bin/srecite
-share/gnome/applications/srecite.desktop
-share/gnome/srecite/srecite.rc
-share/gnome/srecite/icon/STAR_TRANSP.png
-share/gnome/srecite/icon/about.png
-share/gnome/srecite/icon/attach.png
-share/gnome/srecite/icon/back.png
-share/gnome/srecite/icon/check.png
-share/gnome/srecite/icon/configure.png
-share/gnome/srecite/icon/dict.png
-share/gnome/srecite/icon/dot.png
-share/gnome/srecite/icon/edit.png
-share/gnome/srecite/icon/edit_add.png
-share/gnome/srecite/icon/exit.png
-share/gnome/srecite/icon/exits.png
-share/gnome/srecite/icon/goto.png
-share/gnome/srecite/icon/hide.png
-share/gnome/srecite/icon/line.png
-share/gnome/srecite/icon/load.png
-share/gnome/srecite/icon/next.png
-share/gnome/srecite/icon/open.png
-share/gnome/srecite/icon/over.png
-share/gnome/srecite/icon/pencil.png
-share/gnome/srecite/icon/play.png
-share/gnome/srecite/icon/random.png
-share/gnome/srecite/icon/read.png
-share/gnome/srecite/icon/reset.png
-share/gnome/srecite/icon/right.png
-share/gnome/srecite/icon/save.png
-share/gnome/srecite/icon/search.png
-share/gnome/srecite/icon/sound.png
-share/gnome/srecite/icon/srecites.png
-share/gnome/srecite/icon/stop.png
-share/gnome/srecite/icon/style.png
-share/gnome/srecite/icon/test.png
-share/gnome/srecite/icon/wrong.png
-share/gnome/srecite/wordbooks/0.wrd
-share/gnome/srecite/wordbooks/1.wrd
-share/gnome/srecite/wordbooks/10.wrd
-share/gnome/srecite/wordbooks/11.wrd
-share/gnome/srecite/wordbooks/12.wrd
-share/gnome/srecite/wordbooks/13.wrd
-share/gnome/srecite/wordbooks/14.wrd
-share/gnome/srecite/wordbooks/15.wrd
-share/gnome/srecite/wordbooks/16.wrd
-share/gnome/srecite/wordbooks/17.wrd
-share/gnome/srecite/wordbooks/18.wrd
-share/gnome/srecite/wordbooks/19.wrd
-share/gnome/srecite/wordbooks/2.wrd
-share/gnome/srecite/wordbooks/20.wrd
-share/gnome/srecite/wordbooks/21.wrd
-share/gnome/srecite/wordbooks/22.wrd
-share/gnome/srecite/wordbooks/23.wrd
-share/gnome/srecite/wordbooks/24.wrd
-share/gnome/srecite/wordbooks/25.wrd
-share/gnome/srecite/wordbooks/26.wrd
-share/gnome/srecite/wordbooks/27.wrd
-share/gnome/srecite/wordbooks/28.wrd
-share/gnome/srecite/wordbooks/29.wrd
-share/gnome/srecite/wordbooks/3.wrd
-share/gnome/srecite/wordbooks/30.wrd
-share/gnome/srecite/wordbooks/31.wrd
-share/gnome/srecite/wordbooks/32.wrd
-share/gnome/srecite/wordbooks/33.wrd
-share/gnome/srecite/wordbooks/34.wrd
-share/gnome/srecite/wordbooks/35.wrd
-share/gnome/srecite/wordbooks/36.wrd
-share/gnome/srecite/wordbooks/37.wrd
-share/gnome/srecite/wordbooks/38.wrd
-share/gnome/srecite/wordbooks/39.wrd
-share/gnome/srecite/wordbooks/4.wrd
-share/gnome/srecite/wordbooks/40.wrd
-share/gnome/srecite/wordbooks/41.wrd
-share/gnome/srecite/wordbooks/42.wrd
-share/gnome/srecite/wordbooks/43.wrd
-share/gnome/srecite/wordbooks/44.wrd
-share/gnome/srecite/wordbooks/45.wrd
-share/gnome/srecite/wordbooks/46.wrd
-share/gnome/srecite/wordbooks/47.wrd
-share/gnome/srecite/wordbooks/48.wrd
-share/gnome/srecite/wordbooks/49.wrd
-share/gnome/srecite/wordbooks/5.wrd
-share/gnome/srecite/wordbooks/50.wrd
-share/gnome/srecite/wordbooks/51.wrd
-share/gnome/srecite/wordbooks/52.wrd
-share/gnome/srecite/wordbooks/53.wrd
-share/gnome/srecite/wordbooks/54.wrd
-share/gnome/srecite/wordbooks/55.wrd
-share/gnome/srecite/wordbooks/56.wrd
-share/gnome/srecite/wordbooks/57.wrd
-share/gnome/srecite/wordbooks/58.wrd
-share/gnome/srecite/wordbooks/59.wrd
-share/gnome/srecite/wordbooks/6.wrd
-share/gnome/srecite/wordbooks/60.wrd
-share/gnome/srecite/wordbooks/61.wrd
-share/gnome/srecite/wordbooks/62.wrd
-share/gnome/srecite/wordbooks/63.wrd
-share/gnome/srecite/wordbooks/64.wrd
-share/gnome/srecite/wordbooks/65.wrd
-share/gnome/srecite/wordbooks/66.wrd
-share/gnome/srecite/wordbooks/67.wrd
-share/gnome/srecite/wordbooks/68.wrd
-share/gnome/srecite/wordbooks/69.wrd
-share/gnome/srecite/wordbooks/7.wrd
-share/gnome/srecite/wordbooks/70.wrd
-share/gnome/srecite/wordbooks/71.wrd
-share/gnome/srecite/wordbooks/72.wrd
-share/gnome/srecite/wordbooks/73.wrd
-share/gnome/srecite/wordbooks/74.wrd
-share/gnome/srecite/wordbooks/75.wrd
-share/gnome/srecite/wordbooks/76.wrd
-share/gnome/srecite/wordbooks/77.wrd
-share/gnome/srecite/wordbooks/78.wrd
-share/gnome/srecite/wordbooks/8.wrd
-share/gnome/srecite/wordbooks/9.wrd
-share/gnome/srecite/wordbooks/README
-share/gnome/srecite/wordbooks/com
-share/gnome/srecite/wordbooks/index.txt
-share/gnome/srecite/wordbooks/readme-book.txt
-share/gnome/srecite/wordbooks/tf.wrd
+share/applications/srecite.desktop
+share/srecite/srecite.rc
+share/srecite/icon/STAR_TRANSP.png
+share/srecite/icon/about.png
+share/srecite/icon/attach.png
+share/srecite/icon/back.png
+share/srecite/icon/check.png
+share/srecite/icon/configure.png
+share/srecite/icon/dict.png
+share/srecite/icon/dot.png
+share/srecite/icon/edit.png
+share/srecite/icon/edit_add.png
+share/srecite/icon/exit.png
+share/srecite/icon/exits.png
+share/srecite/icon/goto.png
+share/srecite/icon/hide.png
+share/srecite/icon/line.png
+share/srecite/icon/load.png
+share/srecite/icon/next.png
+share/srecite/icon/open.png
+share/srecite/icon/over.png
+share/srecite/icon/pencil.png
+share/srecite/icon/play.png
+share/srecite/icon/random.png
+share/srecite/icon/read.png
+share/srecite/icon/reset.png
+share/srecite/icon/right.png
+share/srecite/icon/save.png
+share/srecite/icon/search.png
+share/srecite/icon/sound.png
+share/srecite/icon/srecites.png
+share/srecite/icon/stop.png
+share/srecite/icon/style.png
+share/srecite/icon/test.png
+share/srecite/icon/wrong.png
+share/srecite/wordbooks/0.wrd
+share/srecite/wordbooks/1.wrd
+share/srecite/wordbooks/10.wrd
+share/srecite/wordbooks/11.wrd
+share/srecite/wordbooks/12.wrd
+share/srecite/wordbooks/13.wrd
+share/srecite/wordbooks/14.wrd
+share/srecite/wordbooks/15.wrd
+share/srecite/wordbooks/16.wrd
+share/srecite/wordbooks/17.wrd
+share/srecite/wordbooks/18.wrd
+share/srecite/wordbooks/19.wrd
+share/srecite/wordbooks/2.wrd
+share/srecite/wordbooks/20.wrd
+share/srecite/wordbooks/21.wrd
+share/srecite/wordbooks/22.wrd
+share/srecite/wordbooks/23.wrd
+share/srecite/wordbooks/24.wrd
+share/srecite/wordbooks/25.wrd
+share/srecite/wordbooks/26.wrd
+share/srecite/wordbooks/27.wrd
+share/srecite/wordbooks/28.wrd
+share/srecite/wordbooks/29.wrd
+share/srecite/wordbooks/3.wrd
+share/srecite/wordbooks/30.wrd
+share/srecite/wordbooks/31.wrd
+share/srecite/wordbooks/32.wrd
+share/srecite/wordbooks/33.wrd
+share/srecite/wordbooks/34.wrd
+share/srecite/wordbooks/35.wrd
+share/srecite/wordbooks/36.wrd
+share/srecite/wordbooks/37.wrd
+share/srecite/wordbooks/38.wrd
+share/srecite/wordbooks/39.wrd
+share/srecite/wordbooks/4.wrd
+share/srecite/wordbooks/40.wrd
+share/srecite/wordbooks/41.wrd
+share/srecite/wordbooks/42.wrd
+share/srecite/wordbooks/43.wrd
+share/srecite/wordbooks/44.wrd
+share/srecite/wordbooks/45.wrd
+share/srecite/wordbooks/46.wrd
+share/srecite/wordbooks/47.wrd
+share/srecite/wordbooks/48.wrd
+share/srecite/wordbooks/49.wrd
+share/srecite/wordbooks/5.wrd
+share/srecite/wordbooks/50.wrd
+share/srecite/wordbooks/51.wrd
+share/srecite/wordbooks/52.wrd
+share/srecite/wordbooks/53.wrd
+share/srecite/wordbooks/54.wrd
+share/srecite/wordbooks/55.wrd
+share/srecite/wordbooks/56.wrd
+share/srecite/wordbooks/57.wrd
+share/srecite/wordbooks/58.wrd
+share/srecite/wordbooks/59.wrd
+share/srecite/wordbooks/6.wrd
+share/srecite/wordbooks/60.wrd
+share/srecite/wordbooks/61.wrd
+share/srecite/wordbooks/62.wrd
+share/srecite/wordbooks/63.wrd
+share/srecite/wordbooks/64.wrd
+share/srecite/wordbooks/65.wrd
+share/srecite/wordbooks/66.wrd
+share/srecite/wordbooks/67.wrd
+share/srecite/wordbooks/68.wrd
+share/srecite/wordbooks/69.wrd
+share/srecite/wordbooks/7.wrd
+share/srecite/wordbooks/70.wrd
+share/srecite/wordbooks/71.wrd
+share/srecite/wordbooks/72.wrd
+share/srecite/wordbooks/73.wrd
+share/srecite/wordbooks/74.wrd
+share/srecite/wordbooks/75.wrd
+share/srecite/wordbooks/76.wrd
+share/srecite/wordbooks/77.wrd
+share/srecite/wordbooks/78.wrd
+share/srecite/wordbooks/8.wrd
+share/srecite/wordbooks/9.wrd
+share/srecite/wordbooks/README
+share/srecite/wordbooks/com
+share/srecite/wordbooks/index.txt
+share/srecite/wordbooks/readme-book.txt
+share/srecite/wordbooks/tf.wrd
 share/icons/srecite.png
-@dirrm share/gnome/srecite/icon
-@dirrm share/gnome/srecite/wordbooks
-@dirrm share/gnome/srecite
+@dirrm share/srecite/icon
+@dirrm share/srecite/wordbooks
+@dirrm share/srecite
+@dirrmtry share/applications
diff --git a/chinese/stardict-dict-zh_CN/Makefile b/chinese/stardict-dict-zh_CN/Makefile
index 48f7251bc624..9006090effa1 100644
--- a/chinese/stardict-dict-zh_CN/Makefile
+++ b/chinese/stardict-dict-zh_CN/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_CN
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -27,12 +27,12 @@ NO_BUILD=	yes
 USE_BZIP2=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-stardict1.3-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
+		${MKDIR} ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-stardict1.3-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
 
 .include <bsd.port.mk>
diff --git a/chinese/stardict-dict-zh_CN/pkg-plist b/chinese/stardict-dict-zh_CN/pkg-plist
index 2d531e97e656..08ff234deb4a 100644
--- a/chinese/stardict-dict-zh_CN/pkg-plist
+++ b/chinese/stardict-dict-zh_CN/pkg-plist
@@ -1,19 +1,19 @@
-share/gnome/stardict/dic/cdict-gb.dict.dz
-share/gnome/stardict/dic/cdict-gb.idx
-share/gnome/stardict/dic/cdict-gb.ifo
-share/gnome/stardict/dic/cedict-gb.dict.dz
-share/gnome/stardict/dic/cedict-gb.idx
-share/gnome/stardict/dic/cedict-gb.ifo
-share/gnome/stardict/dic/oxford-gb.dict.dz
-share/gnome/stardict/dic/oxford-gb.idx
-share/gnome/stardict/dic/oxford-gb.ifo
-share/gnome/stardict/dic/stardict1.3.dict.dz
-share/gnome/stardict/dic/stardict1.3.idx
-share/gnome/stardict/dic/stardict1.3.ifo
-share/gnome/stardict/dic/xdict-ce-gb.dict.dz
-share/gnome/stardict/dic/xdict-ce-gb.idx
-share/gnome/stardict/dic/xdict-ce-gb.ifo
-share/gnome/stardict/dic/xdict-ec-gb.dict.dz
-share/gnome/stardict/dic/xdict-ec-gb.idx
-share/gnome/stardict/dic/xdict-ec-gb.ifo
-@dirrmtry share/gnome/stardict/dic
+share/stardict/dic/cdict-gb.dict.dz
+share/stardict/dic/cdict-gb.idx
+share/stardict/dic/cdict-gb.ifo
+share/stardict/dic/cedict-gb.dict.dz
+share/stardict/dic/cedict-gb.idx
+share/stardict/dic/cedict-gb.ifo
+share/stardict/dic/oxford-gb.dict.dz
+share/stardict/dic/oxford-gb.idx
+share/stardict/dic/oxford-gb.ifo
+share/stardict/dic/stardict1.3.dict.dz
+share/stardict/dic/stardict1.3.idx
+share/stardict/dic/stardict1.3.ifo
+share/stardict/dic/xdict-ce-gb.dict.dz
+share/stardict/dic/xdict-ce-gb.idx
+share/stardict/dic/xdict-ce-gb.ifo
+share/stardict/dic/xdict-ec-gb.dict.dz
+share/stardict/dic/xdict-ec-gb.idx
+share/stardict/dic/xdict-ec-gb.ifo
+@dirrmtry share/stardict/dic
diff --git a/chinese/stardict2-dict-zh_CN/Makefile b/chinese/stardict2-dict-zh_CN/Makefile
index 48f7251bc624..9006090effa1 100644
--- a/chinese/stardict2-dict-zh_CN/Makefile
+++ b/chinese/stardict2-dict-zh_CN/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_CN
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -27,12 +27,12 @@ NO_BUILD=	yes
 USE_BZIP2=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-stardict1.3-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
+		${MKDIR} ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-stardict1.3-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
 
 .include <bsd.port.mk>
diff --git a/chinese/stardict2-dict-zh_CN/pkg-plist b/chinese/stardict2-dict-zh_CN/pkg-plist
index 2d531e97e656..08ff234deb4a 100644
--- a/chinese/stardict2-dict-zh_CN/pkg-plist
+++ b/chinese/stardict2-dict-zh_CN/pkg-plist
@@ -1,19 +1,19 @@
-share/gnome/stardict/dic/cdict-gb.dict.dz
-share/gnome/stardict/dic/cdict-gb.idx
-share/gnome/stardict/dic/cdict-gb.ifo
-share/gnome/stardict/dic/cedict-gb.dict.dz
-share/gnome/stardict/dic/cedict-gb.idx
-share/gnome/stardict/dic/cedict-gb.ifo
-share/gnome/stardict/dic/oxford-gb.dict.dz
-share/gnome/stardict/dic/oxford-gb.idx
-share/gnome/stardict/dic/oxford-gb.ifo
-share/gnome/stardict/dic/stardict1.3.dict.dz
-share/gnome/stardict/dic/stardict1.3.idx
-share/gnome/stardict/dic/stardict1.3.ifo
-share/gnome/stardict/dic/xdict-ce-gb.dict.dz
-share/gnome/stardict/dic/xdict-ce-gb.idx
-share/gnome/stardict/dic/xdict-ce-gb.ifo
-share/gnome/stardict/dic/xdict-ec-gb.dict.dz
-share/gnome/stardict/dic/xdict-ec-gb.idx
-share/gnome/stardict/dic/xdict-ec-gb.ifo
-@dirrmtry share/gnome/stardict/dic
+share/stardict/dic/cdict-gb.dict.dz
+share/stardict/dic/cdict-gb.idx
+share/stardict/dic/cdict-gb.ifo
+share/stardict/dic/cedict-gb.dict.dz
+share/stardict/dic/cedict-gb.idx
+share/stardict/dic/cedict-gb.ifo
+share/stardict/dic/oxford-gb.dict.dz
+share/stardict/dic/oxford-gb.idx
+share/stardict/dic/oxford-gb.ifo
+share/stardict/dic/stardict1.3.dict.dz
+share/stardict/dic/stardict1.3.idx
+share/stardict/dic/stardict1.3.ifo
+share/stardict/dic/xdict-ce-gb.dict.dz
+share/stardict/dic/xdict-ce-gb.idx
+share/stardict/dic/xdict-ce-gb.ifo
+share/stardict/dic/xdict-ec-gb.dict.dz
+share/stardict/dic/xdict-ec-gb.idx
+share/stardict/dic/xdict-ec-gb.ifo
+@dirrmtry share/stardict/dic
diff --git a/chinese/stardict2-dict-zh_TW/Makefile b/chinese/stardict2-dict-zh_TW/Makefile
index c9c9f0dfc6b5..78e56e0b60e8 100644
--- a/chinese/stardict2-dict-zh_TW/Makefile
+++ b/chinese/stardict2-dict-zh_TW/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_TW
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -28,13 +28,13 @@ NO_BUILD=	yes
 USE_BZIP2=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-langdao-ce-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-langdao-ec-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
+		${MKDIR} ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-langdao-ce-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-langdao-ec-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
 
 .include <bsd.port.mk>
diff --git a/chinese/stardict2-dict-zh_TW/pkg-plist b/chinese/stardict2-dict-zh_TW/pkg-plist
index 9eb4682250bd..0ac2fbde5199 100644
--- a/chinese/stardict2-dict-zh_TW/pkg-plist
+++ b/chinese/stardict2-dict-zh_TW/pkg-plist
@@ -1,22 +1,22 @@
-share/gnome/stardict/dic/cdict-big5.dict.dz
-share/gnome/stardict/dic/cdict-big5.idx
-share/gnome/stardict/dic/cdict-big5.ifo
-share/gnome/stardict/dic/cedict-big5.dict.dz
-share/gnome/stardict/dic/cedict-big5.idx
-share/gnome/stardict/dic/cedict-big5.ifo
-share/gnome/stardict/dic/langdao-ce-big5.dict.dz
-share/gnome/stardict/dic/langdao-ce-big5.idx
-share/gnome/stardict/dic/langdao-ce-big5.ifo
-share/gnome/stardict/dic/langdao-ec-big5.dict.dz
-share/gnome/stardict/dic/langdao-ec-big5.idx
-share/gnome/stardict/dic/langdao-ec-big5.ifo
-share/gnome/stardict/dic/oxford-big5.dict.dz
-share/gnome/stardict/dic/oxford-big5.idx
-share/gnome/stardict/dic/oxford-big5.ifo
-share/gnome/stardict/dic/xdict-ce-big5.dict.dz
-share/gnome/stardict/dic/xdict-ce-big5.idx
-share/gnome/stardict/dic/xdict-ce-big5.ifo
-share/gnome/stardict/dic/xdict-ec-big5.dict.dz
-share/gnome/stardict/dic/xdict-ec-big5.idx
-share/gnome/stardict/dic/xdict-ec-big5.ifo
-@dirrmtry share/gnome/stardict/dic
+share/stardict/dic/cdict-big5.dict.dz
+share/stardict/dic/cdict-big5.idx
+share/stardict/dic/cdict-big5.ifo
+share/stardict/dic/cedict-big5.dict.dz
+share/stardict/dic/cedict-big5.idx
+share/stardict/dic/cedict-big5.ifo
+share/stardict/dic/langdao-ce-big5.dict.dz
+share/stardict/dic/langdao-ce-big5.idx
+share/stardict/dic/langdao-ce-big5.ifo
+share/stardict/dic/langdao-ec-big5.dict.dz
+share/stardict/dic/langdao-ec-big5.idx
+share/stardict/dic/langdao-ec-big5.ifo
+share/stardict/dic/oxford-big5.dict.dz
+share/stardict/dic/oxford-big5.idx
+share/stardict/dic/oxford-big5.ifo
+share/stardict/dic/xdict-ce-big5.dict.dz
+share/stardict/dic/xdict-ce-big5.idx
+share/stardict/dic/xdict-ce-big5.ifo
+share/stardict/dic/xdict-ec-big5.dict.dz
+share/stardict/dic/xdict-ec-big5.idx
+share/stardict/dic/xdict-ec-big5.ifo
+@dirrmtry share/stardict/dic
diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile
index 76e116455d2d..300c4193d391 100644
--- a/comms/gfax/Makefile
+++ b/comms/gfax/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gfax
 PORTVERSION=	0.7.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms print gnome
 MASTER_SITES=	http://gfax.cowlug.org/
 
diff --git a/comms/gfax/files/patch-scripts_printer-setup.sh b/comms/gfax/files/patch-scripts_printer-setup.sh
deleted file mode 100644
index c379692b764a..000000000000
--- a/comms/gfax/files/patch-scripts_printer-setup.sh
+++ /dev/null
@@ -1,39 +0,0 @@
---- scripts/printer-setup.sh.orig	Thu Jul  8 23:54:42 2004
-+++ scripts/printer-setup.sh	Fri Jul  9 00:05:00 2004
-@@ -7,15 +7,15 @@
- # Install all the printer profiles
- if [ $1 == "--install" ]; then
- 	# Install GNOME-1.x printer files.
--	if [ -d /usr/share/gnome-print ]; then
--		cp -f /usr/share/gfax/fax-g3.profile /usr/share/gnome-print/profiles
-+	if [ -d /usr/share/gnome/gnome-print ]; then
-+		cp -f /usr/share/gnome/gfax/fax-g3.profile /usr/share/gnome/gnome-print/profiles
- 	fi
- 
- 	# Install GNOME-2.x printer files.
--	for i in /usr/share/libgnomeprint/*
-+	for i in /usr/share/gnome/libgnomeprint/*
- 	do
--		cp -f /usr/share/gfax/GFAX.xml $i/printers
--		cp -f /usr/share/gfax/GNOME-GFAX-PS.xml $i/models
-+		cp -f /usr/share/gnome/gfax/GFAX.xml $i/printers
-+		cp -f /usr/share/gnome/gfax/GNOME-GFAX-PS.xml $i/models
- 	done
- fi
- 
-@@ -23,12 +23,12 @@
- # Remove all the printer profiles
- if [ $1 == "--remove" ]; then
- 	# Remove GNOME-1.x printer files.
--	if [ -d /usr/share/gnome-print ]; then
--		rm -f /usr/share/gnome-print/profiles/fax-g3.profile
-+	if [ -d /usr/share/gnome/gnome-print ]; then
-+		rm -f /usr/share/gnome/gnome-print/profiles/fax-g3.profile
- 	fi
- 
- 	# Remove GNOME-2.x printer files.
--	for i in /usr/share/libgnomeprint/*
-+	for i in /usr/share/gnome/libgnomeprint/*
- 	do
- 		rm -f $i/printers/GFAX.xml
- 		rm -f $i/models/GNOME-GFAX-PS.xml
diff --git a/comms/gfax/pkg-plist b/comms/gfax/pkg-plist
index 17442ab7c41a..d8f2f63a8315 100644
--- a/comms/gfax/pkg-plist
+++ b/comms/gfax/pkg-plist
@@ -1,9 +1,10 @@
 bin/gfax
 bin/gfaxlpr
 lib/gfax/gfax.exe
-share/gnome/applications/gfax.desktop
-share/gnome/libgnomeprint/2.18.1/models/GNOME-GFAX-PS.xml
-share/gnome/libgnomeprint/2.18.1/printers/GFAX.xml
-share/gnome/pixmaps/gfax.png
-share/gnome/pixmaps/send.png
+share/applications/gfax.desktop
+share/libgnomeprint/2.18.2/models/GNOME-GFAX-PS.xml
+share/libgnomeprint/2.18.2/printers/GFAX.xml
+share/pixmaps/gfax.png
+share/pixmaps/send.png
 @dirrm lib/gfax
+@dirrmtry share/applications
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 12bab946f56b..57cc5ef1d28c 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghfaxviewer
 PORTVERSION=	0.22.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	halifax
@@ -31,8 +31,5 @@ MAN1=	halifax.1 ghfaxviewer.1
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\(\$$(datadir)/\)gnome/|\1|g ; \
-		 s|\$$(datadir)/locale|$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/comms/ghfaxviewer/files/patch-configure b/comms/ghfaxviewer/files/patch-configure
deleted file mode 100644
index 94a34523fb58..000000000000
--- a/comms/ghfaxviewer/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- configure	2002/05/13 12:02:06	1.1
-+++ configure	2002/05/13 12:02:24
-@@ -4759,7 +4759,7 @@
-       CFLAGS="$CFLAGS `gnome-config --cflags gnomeui`"
-       LDFLAGS="$LDFLAGS `gnome-config --libs gnomeui`"
-       PIXMAPS_DIR="`gnome-config --datadir`/pixmaps/ghfaxviewer"
--      GNOME_GRAPH_APP_DIR="`gnome-config --datadir`/gnome/apps/Graphics"
-+      GNOME_GRAPH_APP_DIR="`gnome-config --datadir`/apps/Graphics"
- 
-       # Check whether --with-gnome-print-prefix or --without-gnome-print-prefix was given.
- if test "${with_gnome_print_prefix+set}" = set; then
diff --git a/comms/ghfaxviewer/pkg-plist b/comms/ghfaxviewer/pkg-plist
index 757180c7666c..accaee2cdb04 100644
--- a/comms/ghfaxviewer/pkg-plist
+++ b/comms/ghfaxviewer/pkg-plist
@@ -1,10 +1,10 @@
 bin/ghfaxviewer
 share/gnome/apps/Graphics/ghfaxviewer.desktop
-share/gnome/pixmaps/ghfaxviewer/ghfaxviewer-icon.xpm
-share/gnome/pixmaps/ghfaxviewer/ghfaxviewer-logo.xpm
-share/gnome/pixmaps/ghfaxviewer/info.xpm
+share/pixmaps/ghfaxviewer/ghfaxviewer-icon.xpm
+share/pixmaps/ghfaxviewer/ghfaxviewer-logo.xpm
+share/pixmaps/ghfaxviewer/info.xpm
 share/locale/de/LC_MESSAGES/ghfaxviewer.mo
 share/locale/fr/LC_MESSAGES/ghfaxviewer.mo
 share/locale/pl/LC_MESSAGES/ghfaxviewer.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/ghfaxviewer.mo
-@dirrm share/gnome/pixmaps/ghfaxviewer
+@dirrm share/pixmaps/ghfaxviewer
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index b1907d631c2f..4abdbd7b8555 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmfsk
 PORTVERSION=	0.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms audio hamradio
 MASTER_SITES=	http://gmfsk.connect.fi/
 
diff --git a/comms/gmfsk/pkg-plist b/comms/gmfsk/pkg-plist
index 4a171ebbe364..aae645061cee 100644
--- a/comms/gmfsk/pkg-plist
+++ b/comms/gmfsk/pkg-plist
@@ -6,15 +6,15 @@ share/gnome/help/gmfsk/C/figures/tip.png
 share/gnome/help/gmfsk/C/figures/warning.png
 share/gnome/help/gmfsk/C/gmfsk.xml
 share/gnome/help/gmfsk/C/legal.xml
-share/gnome/omf/gmfsk/gmfsk-C.omf
-share/gnome/pixmaps/gmfsk/gnome-screenshot.png
-share/gnome/pixmaps/gmfsk/mfsk.png
-share/gnome/pixmaps/gmfsk/pause.xpm
-share/gnome/pixmaps/gmfsk/rx.xpm
-share/gnome/pixmaps/gmfsk/tune.xpm
-share/gnome/pixmaps/gmfsk/tx.xpm
-@dirrm share/gnome/pixmaps/gmfsk
-@dirrm share/gnome/omf/gmfsk
+share/omf/gmfsk/gmfsk-C.omf
+share/pixmaps/gmfsk/gnome-screenshot.png
+share/pixmaps/gmfsk/mfsk.png
+share/pixmaps/gmfsk/pause.xpm
+share/pixmaps/gmfsk/rx.xpm
+share/pixmaps/gmfsk/tune.xpm
+share/pixmaps/gmfsk/tx.xpm
+@dirrm share/pixmaps/gmfsk
+@dirrm share/omf/gmfsk
 @dirrm share/gnome/help/gmfsk/C/figures
 @dirrm share/gnome/help/gmfsk/C
 @dirrm share/gnome/help/gmfsk
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index 3f4cae434ad4..85e7128e14f7 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -3,6 +3,7 @@
 # Whom:					Matt Dawson <matt@mattsnetwork.co.uk>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	grig
 PORTVERSION=	0.7.2
@@ -22,4 +23,8 @@ USE_GMAKE=	yes
 
 MAN1=		grig.1
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
 .include <bsd.port.mk>
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index 31b1e9ed9100..654dff01dc2d 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tilp2
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
@@ -34,9 +35,15 @@ PLIST_SUB=	NLS="@comment "
 .endif
 
 CONFIGURE_ARGS+=	--without-kde
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -UGTK_DISABLE_DEPRECATED" \
 		LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
 
 MAN1=	tilp.1
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+	@${REINPLACE_CMD} -e 's|#define .*_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/src/device.c ${WRKSRC}/src/toolbar.c
+
 .include <bsd.port.mk>
diff --git a/comms/tilp2/files/patch-src_filesel.c b/comms/tilp2/files/patch-src_filesel.c
new file mode 100644
index 000000000000..e2875849ded0
--- /dev/null
+++ b/comms/tilp2/files/patch-src_filesel.c
@@ -0,0 +1,10 @@
+--- src/filesel.c.orig	2007-10-24 09:06:41.542878494 -0400
++++ src/filesel.c	2007-10-24 09:06:56.125704803 -0400
+@@ -36,6 +36,7 @@
+ #  include <config.h>
+ #endif				/*  */
+ 
++#undef GTK_DISABLE_DEPRECATED
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile
index 882671bd148d..ca9b14d0d4c8 100644
--- a/comms/xdx/Makefile
+++ b/comms/xdx/Makefile
@@ -3,6 +3,7 @@
 # Whom:					Matt Dawson <matt@mattsnetwork.co.uk>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	xdx
 PORTVERSION=	2.2
@@ -20,4 +21,8 @@ USE_GMAKE=	yes
 
 MAN1=		xdx.1
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
 .include <bsd.port.mk>
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 11207f4e9e36..e9f3dcfcea07 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Patrick Gardella <patrick@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	xlog
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://pg4i.chronos.org.uk/download/ \
 		http://www.qsl.net/pg4i/download/
@@ -15,7 +16,7 @@ MAINTAINER=	matt@chronos.org.uk
 COMMENT=	Amateur Radio logging application
 
 USE_GETTEXT=	yes
-USE_GNOME=	libgnomeprint gnomelibs gtk20
+USE_GNOME=	libgnomeprint gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mime-update
 
@@ -32,4 +33,8 @@ WITHNLS=	""
 
 PLIST_SUB+=	WITHNLS=${WITHNLS}
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
 .include <bsd.port.mk>
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index a00741a786fc..6dc2b375acdd 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	libiconv
-PORTVERSION=	1.9.2
-PORTREVISION=	2
+PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	converters devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,14 +20,16 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget
 LIBTOOLFILES=	configure libcharset/configure
 CONFIGURE_ARGS=	--enable-static \
-		--without-libintl-prefix
+		--without-libintl-prefix \
+		--docdir=${DOCSDIR}
 USE_LDCONFIG=	yes
+CONFIGURE_ENV=	gl_cv_cc_visibility="no"
 
 MAN1=		iconv.1
-MAN3=		iconv.3 iconv_open.3 iconv_close.3
+MAN3=		iconv.3 iconv_open.3 iconv_close.3 iconvctl.3
 
-OPTIONS=	EXTRA_ENCODINGS	"Include extra character sets"	on \
-		EXTRA_PATCHES	"Apply patches to fix CP932 add EUCJP-MS" off
+OPTIONS=	EXTRA_ENCODINGS	"Include extra character sets" on
+#		EXTRA_PATCHES	"Apply patches to fix CP932 add EUCJP-MS" off
 
 .ifdef USE_ICONV
 .error USE_ICONV is defined as an environment variable, or in the arguments \
@@ -40,13 +42,13 @@ OPTIONS=	EXTRA_ENCODINGS	"Include extra character sets"	on \
 CONFIGURE_ARGS+=	--enable-extra-encodings
 .endif
 
-.if defined(WITH_EXTRA_PATCHES)
-PATCH_SITES+=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
-PATCH_SITES+=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	nork
-PATCHFILES+=	${DISTNAME}-cp932.patch.gz
-PATCH_DIST_STRIP+=	-p1
-.endif
+#.if defined(WITH_EXTRA_PATCHES)
+#PATCH_SITES+=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
+#PATCH_SITES+=	${MASTER_SITE_LOCAL}
+#PATCH_SITE_SUBDIR=	nork
+#PATCHFILES+=	${DISTNAME}-cp932.patch.gz
+#PATCH_DIST_STRIP+=	-p1
+#.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 28cb99d9cc39..e53fffbe7462 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,6 +1,3 @@
-MD5 (libiconv-1.9.2.tar.gz) = 6bc300365053c815b10b800a21e0bc7e
-SHA256 (libiconv-1.9.2.tar.gz) = fdb726c5d3761d4c1569e702b74cf9561dc07c6a5f48af3e3fd18685f50d490c
-SIZE (libiconv-1.9.2.tar.gz) = 3919945
-MD5 (libiconv-1.9.2-cp932.patch.gz) = e792be53c6feb6b41cd386e6feb725c9
-SHA256 (libiconv-1.9.2-cp932.patch.gz) = 5cb422931b8b2cf7e4f5d11fac7d8e3ca2c5b8254b3efcae3295b0f5921c4e32
-SIZE (libiconv-1.9.2-cp932.patch.gz) = 106981
+MD5 (libiconv-1.11.tar.gz) = b77a17e4a5a817100ad4b2613935055e
+SHA256 (libiconv-1.11.tar.gz) = fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
+SIZE (libiconv-1.11.tar.gz) = 4430930
diff --git a/converters/libiconv/files/patch-configure b/converters/libiconv/files/patch-configure
deleted file mode 100644
index 121192880a29..000000000000
--- a/converters/libiconv/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Fri May 23 05:19:20 2003
-+++ configure	Fri May 30 11:22:14 2003
-@@ -1905,7 +1905,6 @@
- 
- 
- 
--test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
- 
- 
- ac_ext=c
diff --git a/converters/libiconv/files/patch-lib_Makefile.in b/converters/libiconv/files/patch-lib_Makefile.in
index 4a59d96cf9e3..1731460465a7 100644
--- a/converters/libiconv/files/patch-lib_Makefile.in
+++ b/converters/libiconv/files/patch-lib_Makefile.in
@@ -1,10 +1,10 @@
---- lib/Makefile.in.orig	Wed Jun 11 13:05:08 2003
-+++ lib/Makefile.in	Wed Jun 11 13:05:15 2003
-@@ -44,7 +44,7 @@
+--- lib/Makefile.in.orig	Fri Jul 14 09:18:42 2006
++++ lib/Makefile.in	Fri Jun 29 18:30:13 2007
+@@ -48,7 +48,7 @@ SHELL = /bin/sh
  
  # Before making a release, change this according to the libtool documentation,
  # section "Library interface versions".
--LIBICONV_VERSION_INFO = 4:0:2
+-LIBICONV_VERSION_INFO = 6:0:4
 +LIBICONV_VERSION_INFO = 3
  
  # Needed by $(LIBTOOL).
diff --git a/converters/libiconv/files/patch-src::Makefile.in b/converters/libiconv/files/patch-src::Makefile.in
index 2f2b51c4b08c..52b5865d3fdc 100644
--- a/converters/libiconv/files/patch-src::Makefile.in
+++ b/converters/libiconv/files/patch-src::Makefile.in
@@ -1,9 +1,9 @@
---- src/Makefile.in.orig	Sat Jul 10 03:03:28 2004
-+++ src/Makefile.in	Sat Jul 10 03:04:15 2004
-@@ -92,6 +92,7 @@
+--- src/Makefile.in.orig	Fri Jul 14 09:19:07 2006
++++ src/Makefile.in	Fri Jun 29 18:31:59 2007
+@@ -96,6 +96,7 @@ install : all force
  	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
  	case "@host_os@" in \
- 	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
+ 	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
 +	  freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib//libiconv.la @LTLIBINTL@ -o iconv;; \
  	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
  	esac
diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist
index adcc3248beec..aca2a2d8412c 100644
--- a/converters/libiconv/pkg-plist
+++ b/converters/libiconv/pkg-plist
@@ -15,4 +15,5 @@ libdata/charset.alias
 %%DOCSDIR%%/iconv.3.html
 %%DOCSDIR%%/iconv_close.3.html
 %%DOCSDIR%%/iconv_open.3.html
+%%DOCSDIR%%/iconvctl.3.html
 @dirrm %%DOCSDIR%%
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 14469b5f9242..2419ec666875 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.112 2007/03/13 04:35:01 marcus Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.129 2007/10/17 21:36:10 mezz Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	1.10.3.1
+PORTVERSION=	1.12.1
 PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -35,12 +35,11 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--enable-nss=yes \
 		--with-openldap=yes \
-		--with-krb5=/usr \
 		--with-libdb=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-PLIST_SUB=	VERSION="1.10" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="1.12" EVO_VERSION="1.2"
 
 OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
 
@@ -50,15 +49,12 @@ OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libedataserver_e-msgport.c
 .endif
 
-.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so)
-CONFIGURE_ARGS+=	--with-krb5=/usr
-.else
+.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL)
+HEIMDAL_HOME?=	${LOCALBASE}
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
-.if defined(HEIMDAL_HOME)
 CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
-.else
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
-.endif
+.elif !defined(NO_KERBEROS)
+CONFIGURE_ARGS+=        --with-krb5=/usr
 .endif
 
 .if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING)
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 169f3a9c63f6..3a13cbf7a019 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-1.10.3.1.tar.bz2) = c6f804ac25f7c75dc9502b739bf99301
-SHA256 (gnome2/evolution-data-server-1.10.3.1.tar.bz2) = 60daa18544d5b4c675401acc36c4eb9b2ce137ff39e42a7ab603427f473b041f
-SIZE (gnome2/evolution-data-server-1.10.3.1.tar.bz2) = 7119022
+MD5 (gnome2/evolution-data-server-1.12.1.tar.bz2) = 5b4d855ed1ceaaab7db14b50133b5252
+SHA256 (gnome2/evolution-data-server-1.12.1.tar.bz2) = 1a9317da445dd09d7109f96b3b3a6a7bfa962117dd632ff9735bf7f730ff0079
+SIZE (gnome2/evolution-data-server-1.12.1.tar.bz2) = 7465117
diff --git a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
new file mode 100644
index 000000000000..766abb5425d9
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
@@ -0,0 +1,18 @@
+--- calendar/libical/src/libical/icaltz-util.c.orig	2007-08-24 02:48:28.000000000 -0400
++++ calendar/libical/src/libical/icaltz-util.c	2007-08-27 16:23:59.000000000 -0400
+@@ -23,6 +23,15 @@
+ #include <string.h>
+ #if defined(sun) && defined(__SVR4)
+ #include <sys/byteorder.h>
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++#define __BYTE_ORDER            _BYTE_ORDER
++#define __LITTLE_ENDIAN         _LITTLE_ENDIAN
++#define __BIG_ENDIAN            _BIG_ENDIAN
++
++#define bswap_16                bswap16
++#define bswap_32                bswap32
++#define bswap_64                bswap64
+ #else
+ #include <byteswap.h>
+ #include <endian.h>
diff --git a/databases/evolution-data-server/files/patch-camel_camel-block-file.h b/databases/evolution-data-server/files/patch-camel_camel-block-file.h
new file mode 100644
index 000000000000..bb155e24ad65
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_camel-block-file.h
@@ -0,0 +1,10 @@
+--- camel/camel-block-file.h.orig	Tue May 15 01:48:42 2007
++++ camel/camel-block-file.h	Tue May 15 01:49:00 2007
+@@ -21,6 +21,7 @@
+ #ifndef _CAMEL_BLOCK_FILE_H
+ #define _CAMEL_BLOCK_FILE_H
+ 
++#include <sys/types.h>
+ #include <camel/camel-object.h>
+ #include <glib.h>
+ #include <libedataserver/e-msgport.h>
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c
new file mode 100644
index 000000000000..e00b57db0780
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c
@@ -0,0 +1,10 @@
+--- camel/providers/imap4/camel-imap4-specials.c.orig	Thu May 17 18:11:10 2007
++++ camel/providers/imap4/camel-imap4-specials.c	Thu May 17 18:11:17 2007
+@@ -22,6 +22,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <glib.h>
+ #include <string.h>
+ 
+ #include "camel-imap4-specials.h"
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c
new file mode 100644
index 000000000000..55db1a65dcf0
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c
@@ -0,0 +1,19 @@
+--- camel/providers/imap4/camel-imap4-summary.c.orig	Mon May  7 01:01:31 2007
++++ camel/providers/imap4/camel-imap4-summary.c	Mon May  7 01:05:32 2007
+@@ -1148,6 +1148,7 @@ static CamelIMAP4Command *
+ imap4_summary_fetch_flags (CamelFolderSummary *summary)
+ {
+ 	CamelFolder *folder = summary->folder;
++	CamelIMAP4Summary *imap4_summary = (CamelIMAP4Summary *) summary;
+ 	struct imap4_fetch_all_t *fetch;
+ 	CamelMessageInfo *info[2];
+ 	CamelIMAP4Engine *engine;
+@@ -1479,7 +1480,7 @@ camel_imap4_summary_flush_updates (Camel
+ 		}
+ 	} else {
+ 		/* need to fetch new envelopes */
+-		first = scount + 1;
++		seqid = scount + 1;
+ 	}
+ 	
+ 	if (seqid != 0 && seqid <= imap4_summary->exists) {
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index f62645e708e2..1ef8d776b127 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Apr 10 23:42:25 2007
-+++ configure	Wed Apr 11 00:04:30 2007
-@@ -24550,6 +24550,14 @@ case "$host" in
+--- configure.orig	Mon Jun 18 23:55:48 2007
++++ configure	Mon Jun 18 23:56:20 2007
+@@ -24562,6 +24562,14 @@ case "$host" in
      # AC_CACHE_VAL(have_addrinfo, [have_addrinfo=yes])
      # AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
      ;;
@@ -15,7 +15,7 @@
  *)  os_win32=no
      NO_UNDEFINED=''
      SOCKET_LIBS=''
-@@ -28749,7 +28758,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28651,7 +28659,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -24,16 +24,16 @@
  
  int
  main ()
-@@ -29039,7 +29048,7 @@ if test "x${with_krb5}" != "xno"; then
+@@ -28982,7 +28990,7 @@ if test "x${with_krb5}" != "xno"; then
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
 -	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
 +	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
+ 	sunlibs="-lkrb5 -lgss"
  	{ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
  echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; }
- if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -33857,7 +33866,7 @@ idldir='${datadir}'/idl/evolution-data-s
+@@ -33825,7 +33833,7 @@ idldir='${datadir}'/idl/evolution-data-s
  imagesdir='${datadir}'/pixmaps/evolution-data-server
  
  
diff --git a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
new file mode 100644
index 000000000000..417b438a7b34
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/reference/camel/Makefile.in.orig	2007-10-15 09:28:28.000000000 -0400
++++ docs/reference/camel/Makefile.in	2007-10-15 09:29:49.000000000 -0400
+@@ -123,7 +123,7 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HAVE_JW = @HAVE_JW@
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+ ICONV_CFLAGS = @ICONV_CFLAGS@
+ ICONV_LIBS = @ICONV_LIBS@
+ IDL_INCLUDES = @IDL_INCLUDES@
diff --git a/databases/evolution-data-server/files/patch-fix-maildir b/databases/evolution-data-server/files/patch-fix-maildir
deleted file mode 100644
index db2563e0e040..000000000000
--- a/databases/evolution-data-server/files/patch-fix-maildir
+++ /dev/null
@@ -1,141 +0,0 @@
-Index: camel/providers/local/camel-local-provider.c
-===================================================================
---- camel/providers/local/camel-local-provider.c	(revision 7830)
-+++ camel/providers/local/camel-local-provider.c	(working copy)
-@@ -56,7 +56,7 @@
- 	N_("For storing local mail in MH-like mail directories."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	mh_conf_entries,
- 	/* ... */
- };
-@@ -74,7 +74,7 @@
- 	N_("For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR |CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	mbox_conf_entries,
- 	/* ... */
- };
-@@ -96,7 +96,7 @@
- 	N_("For storing local mail in maildir directories."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	maildir_conf_entries,
- 	/* ... */
- };
-@@ -110,9 +110,9 @@
- 	{ CAMEL_PROVIDER_CONF_END }
- };
- 
--static CamelProvider spool_provider = {
-+static CamelProvider spool_file_provider = {
- 	"spool",
--	N_("Standard Unix mbox spool or directory"),
-+	N_("Standard Unix mbox spool file"),
- 	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-@@ -121,6 +121,17 @@
- 	/* ... */
- };
- 
-+static CamelProvider spool_directory_provider = {
-+	"spooldir",
-+	N_("Standard Unix mbox spool directory"),
-+	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
-+	"mail",
-+	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	spool_conf_entries,
-+	/* ... */
-+};
-+
- #endif
- 
- /* build a canonical 'path' */
-@@ -234,13 +245,19 @@
- 	camel_provider_register(&mbox_provider);
- 
- #ifndef G_OS_WIN32
--	spool_conf_entries[0].value = path;  /* default path - same as mbox */
--	spool_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
--	spool_provider.url_hash = local_url_hash;
--	spool_provider.url_equal = local_url_equal;
--	spool_provider.translation_domain = GETTEXT_PACKAGE;
--	camel_provider_register(&spool_provider);
--	
-+	spool_conf_entries[0].value = path;  /* default path - same as mbox; it's for both file and directory */
-+	spool_file_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
-+	spool_file_provider.url_hash = local_url_hash;
-+	spool_file_provider.url_equal = local_url_equal;
-+	spool_file_provider.translation_domain = GETTEXT_PACKAGE;
-+	camel_provider_register(&spool_file_provider);
-+
-+	spool_directory_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
-+	spool_directory_provider.url_hash = local_url_hash;
-+	spool_directory_provider.url_equal = local_url_equal;
-+	spool_directory_provider.translation_domain = GETTEXT_PACKAGE;
-+	camel_provider_register(&spool_directory_provider);
-+
- 	path = getenv("MAILDIR");
- 	maildir_conf_entries[0].value = path ? path : "";  /* default path */
- 	maildir_provider.object_types[CAMEL_PROVIDER_STORE] = camel_maildir_store_get_type ();
-Index: camel/providers/local/ChangeLog
-===================================================================
---- camel/providers/local/ChangeLog	(revision 7830)
-+++ camel/providers/local/ChangeLog	(working copy)
-@@ -1,3 +1,12 @@
-+2007-06-18  Milan Crha  <mcrha@redhat.com>
-+
-+	** Fix for bug #352346
-+
-+	* camel-local-provider.c: (camel_provider_module_init):
-+	New provider spool_file_provider with virtual protocol 'spooldir'
-+	and set CAMEL_URL_NEED_PATH_DIR; registering this provider
-+	as copy for spool files.
-+
- 2007-06-06  Jeffrey Stedfast  <fejj@novell.com>
- 
- 	Robustness fix while making sure the code would properly handle
-Index: camel/ChangeLog
-===================================================================
---- camel/ChangeLog	(revision 7830)
-+++ camel/ChangeLog	(working copy)
-@@ -1,3 +1,11 @@
-+2007-06-18  Milan Crha  <mcrha@redhat.com>
-+
-+	** Fix for bug #352346
-+
-+	* camel-provider.h: Added new constants CAMEL_URL_PART_PATH_DIR and
-+	CAMEL_URL_NEED_PATH_DIR; when CAMEL_URL_NEED_PATH_DIR is set, then
-+	in editor dialog is choosing file, without it directory.
-+
- 2007-06-14  Philip Van Hoof  <pvanhoof@gnome.org>
- 	
- 	* camel-net-utils.c: Memory leak fix
-Index: camel/camel-provider.h
-===================================================================
---- camel/camel-provider.h	(revision 7830)
-+++ camel/camel-provider.h	(working copy)
-@@ -81,6 +81,7 @@
- #define CAMEL_URL_PART_HOST	 (1 << 3)
- #define CAMEL_URL_PART_PORT	 (1 << 4)
- #define CAMEL_URL_PART_PATH	 (1 << 5)
-+#define CAMEL_URL_PART_PATH_DIR  (1 << 6)
- 
- #define CAMEL_URL_PART_NEED	       8
- #define CAMEL_URL_PART_HIDDEN	(CAMEL_URL_PART_NEED + 8)
-@@ -104,6 +105,7 @@
- #define CAMEL_URL_NEED_HOST	 (CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED)
- #define CAMEL_URL_NEED_PORT	 (CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED)
- #define CAMEL_URL_NEED_PATH	 (CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED)
-+#define CAMEL_URL_NEED_PATH_DIR  (CAMEL_URL_PART_PATH_DIR << CAMEL_URL_PART_NEED)
- 
- #define CAMEL_URL_HIDDEN_USER	 (CAMEL_URL_PART_USER << CAMEL_URL_PART_HIDDEN)
- #define CAMEL_URL_HIDDEN_AUTH	 (CAMEL_URL_PART_AUTH << CAMEL_URL_PART_HIDDEN)
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 63069d805d71..9b0f302375eb 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -24,13 +24,16 @@ include/evolution-data-server-%%VERSION%%/camel/camel-folder-summary.h
 include/evolution-data-server-%%VERSION%%/camel/camel-folder-thread.h
 include/evolution-data-server-%%VERSION%%/camel/camel-folder.h
 include/evolution-data-server-%%VERSION%%/camel/camel-gpg-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-html-parser.h
 include/evolution-data-server-%%VERSION%%/camel/camel-http-stream.h
 include/evolution-data-server-%%VERSION%%/camel/camel-i18n.h
+include/evolution-data-server-%%VERSION%%/camel/camel-iconv.h
 include/evolution-data-server-%%VERSION%%/camel/camel-index.h
 include/evolution-data-server-%%VERSION%%/camel/camel-internet-address.h
 include/evolution-data-server-%%VERSION%%/camel/camel-junk-plugin.h
 include/evolution-data-server-%%VERSION%%/camel/camel-list-utils.h
 include/evolution-data-server-%%VERSION%%/camel/camel-lock-client.h
+include/evolution-data-server-%%VERSION%%/camel/camel-lock-helper.h
 include/evolution-data-server-%%VERSION%%/camel/camel-lock.h
 include/evolution-data-server-%%VERSION%%/camel/camel-medium.h
 include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-basic.h
@@ -60,6 +63,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-multipart-encrypted.h
 include/evolution-data-server-%%VERSION%%/camel/camel-multipart-signed.h
 include/evolution-data-server-%%VERSION%%/camel/camel-multipart.h
 include/evolution-data-server-%%VERSION%%/camel/camel-net-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-news-address.h
 include/evolution-data-server-%%VERSION%%/camel/camel-nntp-address.h
 include/evolution-data-server-%%VERSION%%/camel/camel-object.h
 include/evolution-data-server-%%VERSION%%/camel/camel-offline-folder.h
@@ -67,6 +71,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-offline-journal.h
 include/evolution-data-server-%%VERSION%%/camel/camel-offline-store.h
 include/evolution-data-server-%%VERSION%%/camel/camel-operation.h
 include/evolution-data-server-%%VERSION%%/camel/camel-partition-table.h
+include/evolution-data-server-%%VERSION%%/camel/camel-process.h
 include/evolution-data-server-%%VERSION%%/camel/camel-provider.h
 include/evolution-data-server-%%VERSION%%/camel/camel-sasl-anonymous.h
 include/evolution-data-server-%%VERSION%%/camel/camel-sasl-cram-md5.h
@@ -112,7 +117,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
 include/evolution-data-server-%%VERSION%%/camel/camel.h
 include/evolution-data-server-%%VERSION%%/exchange/e-folder-exchange.h
 include/evolution-data-server-%%VERSION%%/exchange/e-folder.h
-include/evolution-data-server-%%VERSION%%/exchange/e-shell-marshal.h
 include/evolution-data-server-%%VERSION%%/exchange/e-storage.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-autoconfig.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-context.h
@@ -152,27 +156,20 @@ include/evolution-data-server-%%VERSION%%/groupwise/e-gw-message.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-proxy.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-recur-utils.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-sendoptions.h
-include/evolution-data-server-%%VERSION%%/libebook/Evolution-DataServer-Addressbook.h
 include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h
-include/evolution-data-server-%%VERSION%%/libebook/e-book-listener.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-query.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-types.h
-include/evolution-data-server-%%VERSION%%/libebook/e-book-view-listener.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-view.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book.h
 include/evolution-data-server-%%VERSION%%/libebook/e-contact.h
 include/evolution-data-server-%%VERSION%%/libebook/e-destination.h
-include/evolution-data-server-%%VERSION%%/libebook/e-name-western-tables.h
 include/evolution-data-server-%%VERSION%%/libebook/e-name-western.h
 include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h
-include/evolution-data-server-%%VERSION%%/libecal/Evolution-DataServer-Calendar.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-component.h
-include/evolution-data-server-%%VERSION%%/libecal/e-cal-listener.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-recur.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-time-util.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-types.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-util.h
-include/evolution-data-server-%%VERSION%%/libecal/e-cal-view-listener.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal.h
 include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h
@@ -207,6 +204,7 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-util.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-db3-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-flag.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-iterator.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-list-iterator.h
@@ -274,6 +272,7 @@ include/evolution-data-server-%%VERSION%%/libical/icalssyacc.h
 include/evolution-data-server-%%VERSION%%/libical/icaltime.h
 include/evolution-data-server-%%VERSION%%/libical/icaltimezone.h
 include/evolution-data-server-%%VERSION%%/libical/icaltypes.h
+include/evolution-data-server-%%VERSION%%/libical/icaltz-util.h
 include/evolution-data-server-%%VERSION%%/libical/icalvalue.h
 include/evolution-data-server-%%VERSION%%/libical/icalvcal.h
 include/evolution-data-server-%%VERSION%%/libical/port.h
@@ -403,6 +402,91 @@ libdata/pkgconfig/libexchange-storage-%%EVO_VERSION%%.pc
 libexec/camel-index-control-%%EVO_VERSION%%
 libexec/camel-lock-helper-%%EVO_VERSION%%
 libexec/evolution-data-server-%%VERSION%%
+share/doc/camel/Addresses.html
+share/doc/camel/ClassTree.html
+share/doc/camel/Crypto.html
+share/doc/camel/Filters.html
+share/doc/camel/Folders.html
+share/doc/camel/Fundamentals.html
+share/doc/camel/MIME.html
+share/doc/camel/Services.html
+share/doc/camel/Streams.html
+share/doc/camel/camel-CamelAddress.html
+share/doc/camel/camel-CamelCipherContext.html
+share/doc/camel/camel-CamelDataWrapper.html
+share/doc/camel/camel-CamelFolder.html
+share/doc/camel/camel-CamelFolderSummary.html
+share/doc/camel/camel-CamelGpgContext.html
+share/doc/camel/camel-CamelInternetAddress.html
+share/doc/camel/camel-CamelMedium.html
+share/doc/camel/camel-CamelMimeFilter.html
+share/doc/camel/camel-CamelMimeFilterBasic.html
+share/doc/camel/camel-CamelMimeFilterBestenc.html
+share/doc/camel/camel-CamelMimeFilterCRLF.html
+share/doc/camel/camel-CamelMimeFilterCanon.html
+share/doc/camel/camel-CamelMimeFilterCharset.html
+share/doc/camel/camel-CamelMimeFilterEnriched.html
+share/doc/camel/camel-CamelMimeFilterFrom.html
+share/doc/camel/camel-CamelMimeFilterHTML.html
+share/doc/camel/camel-CamelMimeFilterIndex.html
+share/doc/camel/camel-CamelMimeFilterPgp.html
+share/doc/camel/camel-CamelMimeFilterSave.html
+share/doc/camel/camel-CamelMimeFilterToHTML.html
+share/doc/camel/camel-CamelMimeFilterWindows.html
+share/doc/camel/camel-CamelMimeFilterYenc.html
+share/doc/camel/camel-CamelMimeMessage.html
+share/doc/camel/camel-CamelMimeParser.html
+share/doc/camel/camel-CamelMimePart.html
+share/doc/camel/camel-CamelMultipart.html
+share/doc/camel/camel-CamelMultipartEncrypted.html
+share/doc/camel/camel-CamelMultipartSigned.html
+share/doc/camel/camel-CamelObject.html
+share/doc/camel/camel-CamelOfflineFolder.html
+share/doc/camel/camel-CamelOfflineJournal.html
+share/doc/camel/camel-CamelOfflineStore.html
+share/doc/camel/camel-CamelSasl.html
+share/doc/camel/camel-CamelSaslAnonymous.html
+share/doc/camel/camel-CamelSaslCramMd5.html
+share/doc/camel/camel-CamelSaslDigestMd5.html
+share/doc/camel/camel-CamelSaslGssapi.html
+share/doc/camel/camel-CamelSaslKerberos4.html
+share/doc/camel/camel-CamelSaslLogin.html
+share/doc/camel/camel-CamelSaslNTLM.html
+share/doc/camel/camel-CamelSaslPlain.html
+share/doc/camel/camel-CamelSeekableStream.html
+share/doc/camel/camel-CamelSeekableSubstream.html
+share/doc/camel/camel-CamelService.html
+share/doc/camel/camel-CamelSession.html
+share/doc/camel/camel-CamelStore.html
+share/doc/camel/camel-CamelStoreSummary.html
+share/doc/camel/camel-CamelStream.html
+share/doc/camel/camel-CamelStreamBuffer.html
+share/doc/camel/camel-CamelStreamFilter.html
+share/doc/camel/camel-CamelStreamFs.html
+share/doc/camel/camel-CamelStreamMem.html
+share/doc/camel/camel-CamelStreamNull.html
+share/doc/camel/camel-CamelStreamVFS.html
+share/doc/camel/camel-CamelTcpStream.html
+share/doc/camel/camel-CamelTcpStreamRaw.html
+share/doc/camel/camel-CamelTcpStreamSSL.html
+share/doc/camel/camel-CamelTransport.html
+share/doc/camel/camel-CamelVTrashFolder.html
+share/doc/camel/camel-CamelVeeFolder.html
+share/doc/camel/camel-camel-exception.html
+share/doc/camel/camel-camel-operation.html
+share/doc/camel/camel-camel-provider.html
+share/doc/camel/camel-camel-url.html
+share/doc/camel/camel.devhelp
+share/doc/camel/camel.devhelp2
+share/doc/camel/classes.html
+share/doc/camel/home.png
+share/doc/camel/index.html
+share/doc/camel/index.sgml
+share/doc/camel/ix01.html
+share/doc/camel/left.png
+share/doc/camel/right.png
+share/doc/camel/style.css
+share/doc/camel/up.png
 share/doc/libebook/EBook.html
 share/doc/libebook/EBookListener.html
 share/doc/libebook/EBookView.html
@@ -461,7 +545,6 @@ share/doc/libedata-book/ix01.html
 share/doc/libedata-book/left.png
 share/doc/libedata-book/libedata-book-EDataBookFactory.html
 share/doc/libedata-book/libedata-book-e-book-backend-db-cache.html
-share/doc/libedata-book/libedata-book-e-data-book-marshal.html
 share/doc/libedata-book/libedata-book-ximian-vcard.html
 share/doc/libedata-book/libedata-book.devhelp
 share/doc/libedata-book/libedata-book.devhelp2
@@ -504,6 +587,7 @@ share/doc/libedataserver/index.html
 share/doc/libedataserver/index.sgml
 share/doc/libedataserver/ix01.html
 share/doc/libedataserver/left.png
+share/doc/libedataserver/libedataserver-EFlag.html
 share/doc/libedataserver/libedataserver-ESExp.html
 share/doc/libedataserver/libedataserver-e-categories.html
 share/doc/libedataserver/libedataserver-e-data-server-module.html
@@ -550,412 +634,16 @@ share/doc/libedataserverui/libedataserverui.devhelp2
 share/doc/libedataserverui/right.png
 share/doc/libedataserverui/style.css
 share/doc/libedataserverui/up.png
-share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema
-share/gnome/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
-share/gnome/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
-share/gnome/evolution-data-server-%%VERSION%%/weather/Locations.xml
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Abidjan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Accra.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Addis_Ababa.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Algiers.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Asmera.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bamako.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bangui.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Banjul.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bissau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Blantyre.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Brazzaville.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bujumbura.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Cairo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Casablanca.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Ceuta.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Conakry.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Dakar.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Dar_es_Salaam.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Djibouti.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Douala.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/El_Aaiun.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Freetown.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Gaborone.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Harare.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Johannesburg.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Kampala.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Khartoum.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Kigali.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Kinshasa.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lagos.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Libreville.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lome.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Luanda.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lubumbashi.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lusaka.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Malabo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Maputo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Maseru.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Mbabane.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Mogadishu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Monrovia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Nairobi.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Ndjamena.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Niamey.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Nouakchott.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Ouagadougou.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Porto-Novo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Sao_Tome.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Timbuktu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Tripoli.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Tunis.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Windhoek.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Adak.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Anchorage.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Anguilla.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Antigua.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Araguaina.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Aruba.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Asuncion.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Barbados.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Belem.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Belize.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Boa_Vista.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Bogota.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Boise.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Buenos_Aires.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cambridge_Bay.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cancun.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Caracas.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Catamarca.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cayenne.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cayman.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Chicago.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Chihuahua.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cordoba.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Costa_Rica.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cuiaba.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Curacao.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Danmarkshavn.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Dawson.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Dawson_Creek.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Denver.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Detroit.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Dominica.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Edmonton.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Eirunepe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/El_Salvador.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Fortaleza.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Glace_Bay.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Godthab.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Goose_Bay.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Grand_Turk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Grenada.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guadeloupe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guatemala.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guayaquil.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guyana.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Halifax.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Havana.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Hermosillo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Indianapolis.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Knox.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Marengo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Vevay.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indianapolis.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Inuvik.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Iqaluit.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Jamaica.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Jujuy.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Juneau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Kentucky/Louisville.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Kentucky/Monticello.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/La_Paz.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Lima.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Los_Angeles.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Louisville.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Maceio.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Managua.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Manaus.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Martinique.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Mazatlan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Mendoza.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Menominee.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Merida.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Mexico_City.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Miquelon.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Monterrey.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Montevideo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Montreal.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Montserrat.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Nassau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/New_York.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Nipigon.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Nome.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Noronha.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/North_Dakota/Center.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Panama.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Pangnirtung.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Paramaribo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Phoenix.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Port-au-Prince.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Port_of_Spain.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Porto_Velho.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Puerto_Rico.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rainy_River.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rankin_Inlet.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Recife.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Regina.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rio_Branco.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rosario.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Santiago.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Santo_Domingo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Sao_Paulo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Scoresbysund.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Shiprock.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Johns.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Kitts.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Lucia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Thomas.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Vincent.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Swift_Current.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Tegucigalpa.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Thule.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Thunder_Bay.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Tijuana.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Tortola.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Vancouver.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Whitehorse.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Winnipeg.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Yakutat.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Yellowknife.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Casey.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Davis.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/DumontDUrville.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Mawson.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/McMurdo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Palmer.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/South_Pole.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Syowa.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Vostok.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Arctic/Longyearbyen.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Aden.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Almaty.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Amman.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Anadyr.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Aqtau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Aqtobe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Ashgabat.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Baghdad.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Bahrain.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Baku.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Bangkok.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Beirut.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Bishkek.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Brunei.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Calcutta.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Choibalsan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Chongqing.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Chungking.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Colombo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Damascus.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dhaka.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dili.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dubai.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dushanbe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Gaza.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Harbin.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Hong_Kong.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Hovd.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Irkutsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Istanbul.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Jakarta.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Jayapura.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Jerusalem.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kabul.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kamchatka.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Karachi.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kashgar.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Katmandu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Krasnoyarsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kuala_Lumpur.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kuching.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kuwait.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Macao.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Magadan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Manila.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Muscat.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Nicosia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Novosibirsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Omsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Phnom_Penh.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Pontianak.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Pyongyang.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Qatar.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Rangoon.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Riyadh.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Saigon.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Sakhalin.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Samarkand.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Seoul.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Shanghai.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Singapore.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Taipei.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tashkent.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tbilisi.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tehran.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Thimphu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tokyo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Ujung_Pandang.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Ulaanbaatar.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Urumqi.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Vientiane.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Vladivostok.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Yakutsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Yekaterinburg.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Yerevan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Azores.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Bermuda.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Canary.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Cape_Verde.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Faeroe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Jan_Mayen.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Madeira.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Reykjavik.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/South_Georgia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/St_Helena.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Stanley.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Adelaide.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Brisbane.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Broken_Hill.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Darwin.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Hobart.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Lindeman.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Lord_Howe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Melbourne.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Perth.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Sydney.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Amsterdam.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Andorra.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Athens.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Belfast.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Belgrade.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Berlin.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Bratislava.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Brussels.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Bucharest.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Budapest.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Chisinau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Copenhagen.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Dublin.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Gibraltar.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Helsinki.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Istanbul.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Kaliningrad.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Kiev.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Lisbon.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Ljubljana.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/London.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Luxembourg.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Madrid.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Malta.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Minsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Monaco.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Moscow.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Nicosia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Oslo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Paris.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Prague.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Riga.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Rome.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Samara.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/San_Marino.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Sarajevo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Simferopol.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Skopje.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Sofia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Stockholm.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Tallinn.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Tirane.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Uzhgorod.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vaduz.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vatican.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vienna.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vilnius.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Warsaw.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Zagreb.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Zaporozhye.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Zurich.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Antananarivo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Chagos.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Christmas.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Cocos.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Comoro.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Kerguelen.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Mahe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Maldives.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Mauritius.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Mayotte.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Reunion.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Apia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Auckland.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Chatham.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Easter.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Efate.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Enderbury.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Fakaofo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Fiji.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Funafuti.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Galapagos.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Gambier.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Guadalcanal.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Guam.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Honolulu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Johnston.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Kiritimati.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Kosrae.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Kwajalein.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Majuro.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Marquesas.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Midway.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Nauru.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Niue.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Norfolk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Noumea.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Pago_Pago.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Palau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Pitcairn.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Ponape.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Port_Moresby.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Rarotonga.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Saipan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Tahiti.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Tarawa.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Tongatapu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Truk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Wake.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Wallis.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Yap.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/zones.tab
-share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Addressbook.idl
-share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Calendar.idl
-share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl
-share/gnome/pixmaps/evolution-data-server/category_birthday_16.png
-share/gnome/pixmaps/evolution-data-server/category_business_16.png
-share/gnome/pixmaps/evolution-data-server/category_favorites_16.png
-share/gnome/pixmaps/evolution-data-server/category_gifts_16.png
-share/gnome/pixmaps/evolution-data-server/category_goals_16.png
-share/gnome/pixmaps/evolution-data-server/category_holiday-cards_16.png
-share/gnome/pixmaps/evolution-data-server/category_holiday_16.png
-share/gnome/pixmaps/evolution-data-server/category_hot-contacts_16.png
-share/gnome/pixmaps/evolution-data-server/category_ideas_16.png
-share/gnome/pixmaps/evolution-data-server/category_international_16.png
-share/gnome/pixmaps/evolution-data-server/category_key-customer_16.png
-share/gnome/pixmaps/evolution-data-server/category_miscellaneous_16.png
-share/gnome/pixmaps/evolution-data-server/category_personal_16.png
-share/gnome/pixmaps/evolution-data-server/category_phonecalls_16.png
-share/gnome/pixmaps/evolution-data-server/category_status_16.png
-share/gnome/pixmaps/evolution-data-server/category_strategies_16.png
-share/gnome/pixmaps/evolution-data-server/category_suppliers_16.png
-share/gnome/pixmaps/evolution-data-server/category_time-and-expenses_16.png
+share/evolution-data-server-%%VERSION%%/evolutionperson.schema
+share/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
+share/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
+share/evolution-data-server-%%VERSION%%/weather/Locations.xml
+share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Addressbook.idl
+share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Calendar.idl
+share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl
 share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/as/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -1003,6 +691,7 @@ share/locale/nb/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/nn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/or/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/pa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -1018,6 +707,7 @@ share/locale/sr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ta/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/te/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/th/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -1027,31 +717,36 @@ share/locale/xh/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-@dirrm share/gnome/pixmaps/evolution-data-server
-@dirrm share/gnome/idl/evolution-data-server-%%EVO_VERSION%%
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Arctic
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/North_Dakota
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Kentucky
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/weather
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/glade
-@dirrm share/gnome/evolution-data-server-%%VERSION%%
+share/pixmaps/evolution-data-server/category_birthday_16.png
+share/pixmaps/evolution-data-server/category_business_16.png
+share/pixmaps/evolution-data-server/category_favorites_16.png
+share/pixmaps/evolution-data-server/category_gifts_16.png
+share/pixmaps/evolution-data-server/category_goals_16.png
+share/pixmaps/evolution-data-server/category_holiday-cards_16.png
+share/pixmaps/evolution-data-server/category_holiday_16.png
+share/pixmaps/evolution-data-server/category_hot-contacts_16.png
+share/pixmaps/evolution-data-server/category_ideas_16.png
+share/pixmaps/evolution-data-server/category_international_16.png
+share/pixmaps/evolution-data-server/category_key-customer_16.png
+share/pixmaps/evolution-data-server/category_miscellaneous_16.png
+share/pixmaps/evolution-data-server/category_personal_16.png
+share/pixmaps/evolution-data-server/category_phonecalls_16.png
+share/pixmaps/evolution-data-server/category_status_16.png
+share/pixmaps/evolution-data-server/category_strategies_16.png
+share/pixmaps/evolution-data-server/category_suppliers_16.png
+share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
+@dirrm share/pixmaps/evolution-data-server
+@dirrm share/idl/evolution-data-server-%%EVO_VERSION%%
+@dirrm share/evolution-data-server-%%VERSION%%/weather
+@dirrm share/evolution-data-server-%%VERSION%%/glade
+@dirrm share/evolution-data-server-%%VERSION%%
 @dirrm share/doc/libedataserverui
 @dirrm share/doc/libedataserver
 @dirrm share/doc/libedata-cal
 @dirrm share/doc/libedata-book
 @dirrm share/doc/libecal
 @dirrm share/doc/libebook
+@dirrm share/doc/camel
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%/extensions
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%/camel-providers
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%
@@ -1070,8 +765,12 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.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/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/ku/LC_MESSAGES
@@ -1080,3 +779,5 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 1bd65f448c4a..c779613fae5c 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/glom/Makefile,v 1.9 2006/09/05 03:44:45 mezz Exp $
+#   $MCom: ports/databases/glom/Makefile,v 1.11 2007/07/23 19:45:47 mezz Exp $
 #
 
 PORTNAME=	glom
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -36,7 +36,8 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 INSTALLS_ICONS=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-update-mime-database|true|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-update-mime-database|true|g' \
+		${WRKSRC}/Makefile.in
 
 post-install:
 	@-update-mime-database ${PREFIX}/share/mime
diff --git a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
index 24ce492ec3a0..a83ec8738c29 100644
--- a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
+++ b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
@@ -1,157 +1,20 @@
---- glom/libglom/python_embed/py_glom_record.cc.orig	2006-04-28 03:12:31.000000000 -0500
-+++ glom/libglom/python_embed/py_glom_record.cc	2007-09-05 00:21:02.305894450 -0500
-@@ -50,51 +50,57 @@
+--- glom/libglom/python_embed/py_glom_record.cc.orig	Sun Jul 15 13:34:18 2007
++++ glom/libglom/python_embed/py_glom_record.cc	Sun Jul 15 13:34:44 2007
+@@ -122,7 +122,7 @@
  
- //Set the object's member data, from the parameters supplied when creating the object:
- static int
--Record_init(PyGlomRecord *self, PyObject * /* args */, PyObject * /* kwds */)
-+Record_init(PyObject *self, PyObject * /* args */, PyObject * /* kwds */)
- {
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+
-   //static char *kwlist[] = {"test", NULL};
- 
-   //if(!PyArg_ParseTupleAndKeywords(args, kwds, "|i", kwlist,
-    //                                 &self->m_test))
-    // return -1;
- 
--  if(self)
-+  if(self_record)
-   {
--    self->m_related = 0;
-+    self_record->m_related = 0;
- 
--    if(self->m_pMap_field_values == 0)
--      self->m_pMap_field_values = new PyGlomRecord::type_map_field_values();
-+    if(self_record->m_pMap_field_values == 0)
-+      self_record->m_pMap_field_values = new PyGlomRecord::type_map_field_values();
-   }
- 
-   return 0;
- }
- 
- static void
--Record_dealloc(PyGlomRecord* self)
-+Record_dealloc(PyObject* self)
- {
--  if(self->m_pMap_field_values)
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+
-+  if(self_record->m_pMap_field_values)
-   {
--    delete self->m_pMap_field_values;
--    self->m_pMap_field_values = 0;
-+    delete self_record->m_pMap_field_values;
-+    self_record->m_pMap_field_values = 0;
-   }
- 
--  self->ob_type->tp_free((PyObject*)self);
-+  self_record->ob_type->tp_free((PyObject*)self);
- }
- 
- 
- static PyObject *
--Record__get_related(PyGlomRecord* self, void* /* closure */)
-+Record__get_related(PyObject* self, void* /* closure */)
- {
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+
-   //We initialize it here, so that this work never happens if it's not needed:
--  if(!(self->m_related))
-+  if(!(self_record->m_related))
-   {
-     //Return a new RelatedRecord:
-     PyObject* new_args = PyTuple_New(0);
--    self->m_related = (PyGlomRelated*)PyObject_Call((PyObject*)PyGlomRelated_GetPyType(), new_args, 0);
-+    self_record->m_related = (PyGlomRelated*)PyObject_Call((PyObject*)PyGlomRelated_GetPyType(), new_args, 0);
-     Py_DECREF(new_args);
- 
-     //Fill it:
--    Document_Glom::type_vecRelationships vecRelationships = self->m_document->get_relationships(*(self->m_table_name));
-+    Document_Glom::type_vecRelationships vecRelationships = self_record->m_document->get_relationships(*(self_record->m_table_name));
-     PyGlomRelated::type_map_relationships map_relationships;
-     for(Document_Glom::type_vecRelationships::const_iterator iter = vecRelationships.begin(); iter != vecRelationships.end(); ++iter)
-     {
-@@ -102,14 +108,14 @@
-         map_relationships[(*iter)->get_name()] = *iter;
-     }
  
--    PyGlomRelated_SetRelationships(self->m_related, map_relationships);
-+    PyGlomRelated_SetRelationships(self_record->m_related, map_relationships);
  
--    self->m_related->m_record = self;
--    Py_XINCREF(self); //unreffed in the self->m_related's _dealloc. //TODO: Is this a circular reference?
-+    self_record->m_related->m_record = self_record;
-+    Py_XINCREF(self_record); //unreffed in the self->m_related's _dealloc. //TODO: Is this a circular reference?
-   }
- 
--  Py_INCREF(self->m_related); //Should we do this?
--  return (PyObject*)self->m_related;
-+  Py_INCREF(self_record->m_related); //Should we do this?
-+  return (PyObject*)self_record->m_related;
- }
- 
- 
-@@ -122,31 +128,44 @@
- 
- 
- 
-+//Adapt to API changes in Python 2.5:
-+#if defined(PY_VERSION_HEX) && (PY_VERSION_HEX >= 0x02050000) /* Python 2.5+ */
+-static int
 +static Py_ssize_t
-+Record_tp_as_mapping_length(PyObject *self)
-+{
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+  return self_record->m_pMap_field_values->size();
-+}
-+#else
- static int
--Record_tp_as_mapping_length(PyGlomRecord *self)
-+Record_tp_as_mapping_length(PyObject *self)
+ Record_tp_as_mapping_length(PyGlomRecord *self)
  {
--  return self->m_pMap_field_values->size();
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+  return (int)(self->m_pMap_field_values->size());
- }
-+#endif
- 
- static PyObject *
--Record_tp_as_mapping_getitem(PyGlomRecord *self, PyObject *item)
-+Record_tp_as_mapping_getitem(PyObject *self, PyObject *item)
- {
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+
-   if(PyString_Check(item))
-   {
-     const char* pchKey = PyString_AsString(item);
-     if(pchKey)
-     {
-       const Glib::ustring key(pchKey);
--      if(self && self->m_pMap_field_values)
-+      if(self_record && self_record->m_pMap_field_values)
-       {
--        PyGlomRecord::type_map_field_values::const_iterator iterFind = self->m_pMap_field_values->find(key);
--        if(iterFind != self->m_pMap_field_values->end())
-+        PyGlomRecord::type_map_field_values::const_iterator iterFind = self_record->m_pMap_field_values->find(key);
-+        if(iterFind != self_record->m_pMap_field_values->end())
-         {
-           return pygda_value_as_pyobject(iterFind->second.gobj(), true /* copy */);
+   return self->m_pMap_field_values->size();
+@@ -146,7 +146,7 @@
          }
          else
          {
 -          g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", self->m_pMap_field_values->size(), pchKey);
-+          g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", (int)self_record->m_pMap_field_values->size(), pchKey);
++          g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", (int)self->m_pMap_field_values->size(), pchKey);
          }
        }
        else
-@@ -180,8 +199,8 @@
- */
- 
- static PyMappingMethods Record_tp_as_mapping = {
--    (inquiry)Record_tp_as_mapping_length,
--    (binaryfunc)Record_tp_as_mapping_getitem,
-+    Record_tp_as_mapping_length,
-+    Record_tp_as_mapping_getitem,
-     (objobjargproc)0 /* Record_tp_as_mapping_setitem */
- };
- 
diff --git a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_related.cc b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_related.cc
deleted file mode 100644
index 206b2133b49e..000000000000
--- a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_related.cc
+++ /dev/null
@@ -1,170 +0,0 @@
---- glom/libglom/python_embed/py_glom_related.cc.orig	2006-05-20 06:35:32.000000000 -0500
-+++ glom/libglom/python_embed/py_glom_related.cc	2007-09-05 00:42:52.657306150 -0500
-@@ -52,62 +52,79 @@
- 
- //Set the object's member data, from the parameters supplied when creating the object:
- static int
--Related_init(PyGlomRelated *self, PyObject* /* args */, PyObject* /* kwds */)
-+Related_init(PyObject *self, PyObject* /* args */, PyObject* /* kwds */)
- {
--  if(self)
-+  PyGlomRelated *self_related = (PyGlomRelated*)self;
-+
-+  if(self_related)
-   {
--    self->m_record = 0;
-+    self_related->m_record = 0;
- 
--    if(self->m_pMap_relationships == 0)
--      self->m_pMap_relationships = new PyGlomRelated::type_map_relationships();
-+    if(self_related->m_pMap_relationships == 0)
-+      self_related->m_pMap_relationships = new PyGlomRelated::type_map_relationships();
- 
--    if(self->m_pMap_relatedrecords == 0)
--      self->m_pMap_relatedrecords = new PyGlomRelated::type_map_relatedrecords();
-+    if(self_related->m_pMap_relatedrecords == 0)
-+      self_related->m_pMap_relatedrecords = new PyGlomRelated::type_map_relatedrecords();
-   }
- 
-   return 0;
- }
- 
- static void
--Related_dealloc(PyGlomRelated* self)
-+Related_dealloc(PyObject* self)
- {
--  if(self->m_pMap_relationships)
-+  PyGlomRelated *self_related = (PyGlomRelated*)self;
-+
-+  if(self_related->m_pMap_relationships)
-   {
--    delete self->m_pMap_relationships;
--    self->m_pMap_relationships = 0;
-+    delete self_related->m_pMap_relationships;
-+    self_related->m_pMap_relationships = 0;
-   }
- 
--  if(self->m_record)
-+  if(self_related->m_record)
-   {
--    Py_XDECREF( (PyObject*)self->m_record );
--    self->m_record = 0;
-+    Py_XDECREF( (PyObject*)self_related->m_record );
-+    self_related->m_record = 0;
-   }
- 
--  if(self->m_pMap_relatedrecords)
-+  if(self_related->m_pMap_relatedrecords)
-   {
-     //Unref each item:
--    for(PyGlomRelated::type_map_relatedrecords::iterator iter = self->m_pMap_relatedrecords->begin(); iter != self->m_pMap_relatedrecords->end(); ++iter)
-+    for(PyGlomRelated::type_map_relatedrecords::iterator iter = self_related->m_pMap_relatedrecords->begin(); iter != self_related->m_pMap_relatedrecords->end(); ++iter)
-     {
-       Py_XDECREF( (PyObject*)(iter->second) );
-     }
- 
--    delete self->m_pMap_relatedrecords;
--    self->m_pMap_relatedrecords = 0;
-+    delete self_related->m_pMap_relatedrecords;
-+    self_related->m_pMap_relatedrecords = 0;
-   }
- 
--  self->ob_type->tp_free((PyObject*)self);
-+  self_related->ob_type->tp_free((PyObject*)self);
- }
- 
- 
-+//Adapt to API changes in Python 2.5:
-+#if defined(PY_VERSION_HEX) && (PY_VERSION_HEX >= 0x02050000) /* Python 2.5 */
-+static Py_ssize_t
-+Related_tp_as_mapping_length(PyObject *self)
-+{
-+  PyGlomRelated *self_related = (PyGlomRelated*)self;
-+  return self_related->m_pMap_relationships->size();
-+}
-+#else
- static int
--Related_tp_as_mapping_length(PyGlomRelated *self)
-+Related_tp_as_mapping_length(PyObject *self)
- {
--  return self->m_pMap_relationships->size();
-+  PyGlomRelated *self_related = (PyGlomRelated*)self;
-+  return self_related->m_pMap_relationships->size();
- }
-+#endif
- 
- static PyObject *
--Related_tp_as_mapping_getitem(PyGlomRelated *self, PyObject *item)
-+Related_tp_as_mapping_getitem(PyObject *self, PyObject *item)
- {
-+  PyGlomRelated *self_related = (PyGlomRelated*)self;
-+
-   if(PyString_Check(item))
-   {
-     const char* pchKey = PyString_AsString(item);
-@@ -116,8 +133,8 @@
-       const Glib::ustring key(pchKey);
- 
-       //Return a cached item if possible:
--      PyGlomRelated::type_map_relatedrecords::iterator iterCacheFind = self->m_pMap_relatedrecords->find(key);
--      if(iterCacheFind != self->m_pMap_relatedrecords->end())
-+      PyGlomRelated::type_map_relatedrecords::iterator iterCacheFind = self_related->m_pMap_relatedrecords->find(key);
-+      if(iterCacheFind != self_related->m_pMap_relatedrecords->end())
-       {
-         //Return a reference to the cached item:
-         PyGlomRelatedRecord* pyRelatedRecord = iterCacheFind->second;
-@@ -127,8 +144,8 @@
-       else
-       {
-         //If the relationship exists:
--        PyGlomRelated::type_map_relationships::const_iterator iterFind = self->m_pMap_relationships->find(key);
--        if(iterFind != self->m_pMap_relationships->end())
-+        PyGlomRelated::type_map_relationships::const_iterator iterFind = self_related->m_pMap_relationships->find(key);
-+        if(iterFind != self_related->m_pMap_relationships->end())
-         {
-           //Return a new RelatedRecord:
-           PyObject* new_args = PyTuple_New(0);
-@@ -140,15 +157,15 @@
-           //Get the value of the from_key in the parent record.
-           sharedptr<Relationship> relationship = iterFind->second;
-           const Glib::ustring from_key = relationship->get_from_field();
--          PyGlomRecord::type_map_field_values::const_iterator iterFromKey = self->m_record->m_pMap_field_values->find(from_key);
--          if(iterFromKey != self->m_record->m_pMap_field_values->end())
-+          PyGlomRecord::type_map_field_values::const_iterator iterFromKey = self_related->m_record->m_pMap_field_values->find(from_key);
-+          if(iterFromKey != self_related->m_record->m_pMap_field_values->end())
-           {
-             const Gnome::Gda::Value from_key_value = iterFromKey->second;
- 
-             //TODO_Performance:
-             //Get the full field details so we can sqlize its value:
-             sharedptr<Field> from_key_field;
--            from_key_field = self->m_record->m_document->get_field(*(self->m_record->m_table_name), from_key);
-+            from_key_field = self_related->m_record->m_document->get_field(*(self_related->m_record->m_table_name), from_key);
-             if(from_key_field)
-             {
-               Glib::ustring key_value_sqlized;
-@@ -157,11 +174,11 @@
-               if(!GlomConversions::value_is_empty(from_key_value)) //Do not link on null-values. That would cause us to link on 0, or "0".
-                 key_value_sqlized = from_key_field->sql(from_key_value);
- 
--              PyGlomRelatedRecord_SetRelationship(pyRelatedRecord, iterFind->second, key_value_sqlized, self->m_record->m_document);
-+              PyGlomRelatedRecord_SetRelationship(pyRelatedRecord, iterFind->second, key_value_sqlized, self_related->m_record->m_document);
- 
-               //Store it in the cache:
-               Py_INCREF((PyObject*)pyRelatedRecord); //Dereferenced in _dealloc().
--              (*(self->m_pMap_relatedrecords))[key] = pyRelatedRecord;
-+              (*(self_related->m_pMap_relatedrecords))[key] = pyRelatedRecord;
- 
-               return (PyObject*)pyRelatedRecord; //TODO: pygda_value_as_pyobject(iterFind->second.gobj(), true /* copy */);
-             }
-@@ -185,8 +202,8 @@
- */
- 
- static PyMappingMethods Related_tp_as_mapping = {
--    (inquiry)Related_tp_as_mapping_length,
--    (binaryfunc)Related_tp_as_mapping_getitem,
-+    Related_tp_as_mapping_length,
-+    Related_tp_as_mapping_getitem,
-     (objobjargproc)0 /* Related_tp_as_mapping_setitem */
- };
- 
diff --git a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_relatedrecord.cc b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_relatedrecord.cc
deleted file mode 100644
index 43f0df8e9706..000000000000
--- a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_relatedrecord.cc
+++ /dev/null
@@ -1,153 +0,0 @@
---- glom/libglom/python_embed/py_glom_relatedrecord.cc.orig	2006-05-20 06:35:36.000000000 -0500
-+++ glom/libglom/python_embed/py_glom_relatedrecord.cc	2007-09-05 01:02:13.606806043 -0500
-@@ -137,11 +137,22 @@
- */
- 
- 
-+//Adapt to API changes in Python 2.5:
-+#if defined(PY_VERSION_HEX) && (PY_VERSION_HEX >= 0x02050000) /* Python 2.5+ */
-+static Py_ssize_t
-+RelatedRecord_tp_as_mapping_length(PyObject *self)
-+{
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return self_derived->m_pMap_field_values->size();
-+}
-+#else
- static int
--RelatedRecord_tp_as_mapping_length(PyGlomRelatedRecord *self)
-+RelatedRecord_tp_as_mapping_length(PyObject *self)
- {
--  return self->m_pMap_field_values->size();
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return (int)(self_derived->m_pMap_field_values->size());
- }
-+#endif
- 
- static void RelatedRecord_HandlePythonError()
- {
-@@ -150,29 +161,31 @@
- }
- 
- static PyObject *
--RelatedRecord_tp_as_mapping_getitem(PyGlomRelatedRecord *self, PyObject *item)
-+RelatedRecord_tp_as_mapping_getitem(PyObject *self, PyObject *item)
- {
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+
-   if(PyString_Check(item))
-   {
-     const char* pchKey = PyString_AsString(item);
-     if(pchKey)
-     {
-       const Glib::ustring field_name(pchKey);
--      PyGlomRelatedRecord::type_map_field_values::const_iterator iterFind = self->m_pMap_field_values->find(field_name);
--      if(iterFind != self->m_pMap_field_values->end())
-+      PyGlomRelatedRecord::type_map_field_values::const_iterator iterFind = self_derived->m_pMap_field_values->find(field_name);
-+      if(iterFind != self_derived->m_pMap_field_values->end())
-       {
-         //If the value has already been stored, then just return it again:
-         return pygda_value_as_pyobject(iterFind->second.gobj(), true /* copy */);
-       }
-       else
-       {
--         const Glib::ustring related_table = (*(self->m_relationship))->get_to_table();
-+         const Glib::ustring related_table = (*(self_derived->m_relationship))->get_to_table();
- 
-         //Check whether the field exists in the table.
-         //TODO_Performance: Do this without the useless Field information?
--        sharedptr<Field> field  = self->m_document->get_field((*(self->m_relationship))->get_to_table(), field_name);
-+        sharedptr<Field> field  = self_derived->m_document->get_field((*(self_derived->m_relationship))->get_to_table(), field_name);
-         if(!field)
--          g_warning("RelatedRecord_tp_as_mapping_getitem: field %s not found in table %s", field_name.c_str(), (*(self->m_relationship))->get_to_table().c_str());
-+          g_warning("RelatedRecord_tp_as_mapping_getitem: field %s not found in table %s", field_name.c_str(), (*(self_derived->m_relationship))->get_to_table().c_str());
-         else
-         {
-           //Try to get the value from the database:
-@@ -182,15 +195,15 @@
-           {
-             Glib::RefPtr<Gnome::Gda::Connection> gda_connection = sharedconnection->get_gda_connection();
- 
--            const Glib::ustring related_key_name = (*(self->m_relationship))->get_to_field();
-+            const Glib::ustring related_key_name = (*(self_derived->m_relationship))->get_to_field();
- 
-             //Do not try to get a value based on a null key value:
--            if(!(self->m_from_key_value_sqlized))
-+            if(!(self_derived->m_from_key_value_sqlized))
-               return Py_None;
-        
-             //Get the single value from the related records:
-             Glib::ustring sql_query = "SELECT \"" + related_table + "\".\"" + field_name + "\" FROM \"" + related_table + "\""
--              + " WHERE \"" + related_table + "\".\"" + related_key_name + "\" = " + *(self->m_from_key_value_sqlized);
-+              + " WHERE \"" + related_table + "\".\"" + related_key_name + "\" = " + *(self_derived->m_from_key_value_sqlized);
- 
-             //std::cout << "PyGlomRelatedRecord: Executing:  " << sql_query << std::endl;
-             Glib::RefPtr<Gnome::Gda::DataModel> datamodel = gda_connection->execute_single_command(sql_query);
-@@ -200,7 +213,7 @@
-               //g_warning("RelatedRecord_tp_as_mapping_getitem(): value from datamodel = %s", value.to_string().c_str());
- 
-               //Cache it, in case it's asked-for again.
--              (*(self->m_pMap_field_values))[field_name] = value;
-+              (*(self_derived->m_pMap_field_values))[field_name] = value;
-               return pygda_value_as_pyobject(value.gobj(), true /* copy */);
-             }
-             else if(!datamodel)
-@@ -211,7 +224,7 @@
-             }
-             else
-             {
--              g_warning("RelatedRecord_tp_as_mapping_getitem(): No related records exist yet for relationship %s.",  (*(self->m_relationship))->get_name().c_str());
-+              g_warning("RelatedRecord_tp_as_mapping_getitem(): No related records exist yet for relationship %s.",  (*(self_derived->m_relationship))->get_name().c_str());
-             }
-           }
-         }
-@@ -234,8 +247,8 @@
- */
- 
- static PyMappingMethods RelatedRecord_tp_as_mapping = {
--    (inquiry)RelatedRecord_tp_as_mapping_length,
--    (binaryfunc)RelatedRecord_tp_as_mapping_getitem,
-+    RelatedRecord_tp_as_mapping_length,
-+    RelatedRecord_tp_as_mapping_getitem,
-     (objobjargproc)0 /* RelatedRecord_tp_as_mapping_setitem */
- };
- 
-@@ -311,27 +324,31 @@
- }
- 
- static PyObject *
--RelatedRecord_sum(PyGlomRelatedRecord* self, PyObject *args, PyObject *kwargs)
-+RelatedRecord_sum(PyObject* self, PyObject *args, PyObject *kwargs)
- {
--  return RelatedRecord_generic_aggregate(self, args, kwargs, "sum");
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return RelatedRecord_generic_aggregate(self_derived, args, kwargs, "sum");
- }
- 
- static PyObject *
--RelatedRecord_count(PyGlomRelatedRecord* self, PyObject *args, PyObject *kwargs)
-+RelatedRecord_count(PyObject* self, PyObject *args, PyObject *kwargs)
- {
--  return RelatedRecord_generic_aggregate(self, args, kwargs, "count");
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return RelatedRecord_generic_aggregate(self_derived, args, kwargs, "count");
- }
- 
- static PyObject *
--RelatedRecord_min(PyGlomRelatedRecord* self, PyObject *args, PyObject *kwargs)
-+RelatedRecord_min(PyObject* self, PyObject *args, PyObject *kwargs)
- {
--  return RelatedRecord_generic_aggregate(self, args, kwargs, "min");
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return RelatedRecord_generic_aggregate(self_derived, args, kwargs, "min");
- }
- 
- static PyObject *
--RelatedRecord_max(PyGlomRelatedRecord* self, PyObject *args, PyObject *kwargs)
-+RelatedRecord_max(PyObject* self, PyObject *args, PyObject *kwargs)
- {
--  return RelatedRecord_generic_aggregate(self, args, kwargs, "max");
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return RelatedRecord_generic_aggregate(self_derived, args, kwargs, "max");
- }
- 
- static PyMethodDef RelatedRecord_methods[] = {
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index 88bcda3abfc4..2f5df39bee37 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -6,19 +6,19 @@ lib/libglom.so.0
 %%PYTHON_SITELIBDIR%%/glom.a
 %%PYTHON_SITELIBDIR%%/glom.la
 %%PYTHON_SITELIBDIR%%/glom.so
-share/gnome/applications/glom.desktop
-share/gnome/glom/doc/examples/example_smallbusiness.glom
-share/gnome/glom/glade/glom.glade
-share/gnome/glom/glom_document.dtd
-share/gnome/glom/xslt/print_details_to_html.xsl
-share/gnome/glom/xslt/print_report_to_html.xsl
+share/applications/glom.desktop
+share/glom/doc/examples/example_smallbusiness.glom
+share/glom/glade/glom.glade
+share/glom/glom_document.dtd
+share/glom/xslt/print_details_to_html.xsl
+share/glom/xslt/print_report_to_html.xsl
 share/gnome/help/glom/C/figures/start.png
 share/gnome/help/glom/C/glom.xml
 share/gnome/help/glom/C/legal.xml
 share/gnome/help/glom/de/figures/start.png
 share/gnome/help/glom/de/glom.xml
-share/gnome/mime-info/glom.keys
-share/gnome/mime-info/glom.mime
+share/mime-info/glom.keys
+share/mime-info/glom.mime
 share/icons/hicolor/48x48/apps/glom.png
 share/icons/hicolor/scalable/apps/glom.svg
 share/locale/ca/LC_MESSAGES/glom.mo
@@ -48,12 +48,13 @@ share/mime/packages/glom.xml
 @dirrm share/gnome/help/glom/C/figures
 @dirrm share/gnome/help/glom/C
 @dirrm share/gnome/help/glom
-@dirrm share/gnome/glom/xslt
-@dirrm share/gnome/glom/glade
-@dirrm share/gnome/glom/doc/examples
-@dirrm share/gnome/glom/doc
-@dirrm share/gnome/glom
+@dirrm share/glom/xslt
+@dirrm share/glom/glade
+@dirrm share/glom/doc/examples
+@dirrm share/glom/doc
+@dirrm share/glom
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 50c19c6d7c32..6ce21fb3c9aa 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/gnome-db/Makefile,v 1.2 2006/09/10 00:51:05 mezz Exp $
+#   $MCom: ports/databases/gnome-db/Makefile,v 1.5 2007/05/19 21:36:00 marcus Exp $
 #
 
 PORTNAME=	gnome-db
 PORTVERSION=	0.2.96
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-db/0.2
diff --git a/databases/gnome-db/files/patch-doc::C::reference::Makefile.in b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
index b9c8dda0e901..0509e52a6de6 100644
--- a/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
+++ b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
@@ -7,7 +7,7 @@ $FreeBSD$
  
  
  DOC_MAIN_SGML_FILE = libgnomedb-reference.sgml
--DOC_DIR = $(datadir)/html
+-DOC_DIR = $(datadir)/gnome/html
 +DOC_DIR = $(prefix)/share/doc/gnomedb
  TARGET_DIR = $(DOC_DIR)/libgnomedb-reference
  
diff --git a/databases/gnome-db/files/patch-idl::Makefile.in b/databases/gnome-db/files/patch-idl::Makefile.in
deleted file mode 100644
index da60a4cfbf63..000000000000
--- a/databases/gnome-db/files/patch-idl::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- idl/Makefile.in	2001/07/26 14:06:24	1.1
-+++ idl/Makefile.in	2001/07/26 14:06:37
-@@ -153,7 +153,7 @@
- EXTRA_DIST =  	$(IDL_FILES)
- 
- 
--idldir = $(prefix)/share/idl
-+idldir = $(prefix)/share/gnome/idl
- idl_DATA = $(IDL_FILES)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/databases/gnome-db/pkg-plist b/databases/gnome-db/pkg-plist
index b85a8396e885..9226911f6ed3 100644
--- a/databases/gnome-db/pkg-plist
+++ b/databases/gnome-db/pkg-plist
@@ -118,25 +118,12 @@ share/gnome/help/gnome-db/pt_BR/manager.html
 share/gnome/help/gnome-db/pt_BR/topic.dat
 share/gnome/help/gnome-db/pt_BR/widgetlib-overview.html
 share/gnome/help/gnome-db/pt_BR/widgetlib.html
-share/gnome/idl/GNOME_Database_UI.idl
-share/gnome/oaf/GNOME_DB_Builder.oaf
-share/gnome/oaf/GNOME_DB_ComponentFactory.oaf
-share/gnome/oaf/GNOME_DB_Connection.oaf
-share/gnome/oaf/GNOME_DB_Designer.oaf
-share/gnome/oaf/GNOME_DB_Export.oaf
-share/gnome/oaf/GNOME_DB_Log.oaf
-share/gnome/oaf/GNOME_DB_Manager.oaf
-share/gnome/oaf/GNOME_DB_Monikers.oaf
-share/gnome/omf/gnome-db/gnome-db-C.omf
-share/gnome/omf/gnome-db/gnome-db-es.omf
-share/gnome/omf/gnome-db/gnome-db-it.omf
-share/gnome/omf/gnome-db/gnome-db-pt_BR.omf
-share/gnome/pixmaps/gnome-db.png
 share/gnome/ui/gnomedb-com-connection.xml
 share/gnome/ui/gnomedb-com-designer.xml
 share/gnome/ui/gnomedb-com-log.xml
 share/gnome/ui/gnomedb-fe.xml
 share/gnome/ui/gnomedb-manager.xml
+share/idl/GNOME_Database_UI.idl
 share/locale/az/LC_MESSAGES/gnome-db.mo
 share/locale/ca/LC_MESSAGES/gnome-db.mo
 share/locale/da/LC_MESSAGES/gnome-db.mo
@@ -164,7 +151,20 @@ share/locale/sv/LC_MESSAGES/gnome-db.mo
 share/locale/tr/LC_MESSAGES/gnome-db.mo
 share/locale/uk/LC_MESSAGES/gnome-db.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
-@dirrm share/gnome/omf/gnome-db
+share/oaf/GNOME_DB_Builder.oaf
+share/oaf/GNOME_DB_ComponentFactory.oaf
+share/oaf/GNOME_DB_Connection.oaf
+share/oaf/GNOME_DB_Designer.oaf
+share/oaf/GNOME_DB_Export.oaf
+share/oaf/GNOME_DB_Log.oaf
+share/oaf/GNOME_DB_Manager.oaf
+share/oaf/GNOME_DB_Monikers.oaf
+share/omf/gnome-db/gnome-db-C.omf
+share/omf/gnome-db/gnome-db-es.omf
+share/omf/gnome-db/gnome-db-it.omf
+share/omf/gnome-db/gnome-db-pt_BR.omf
+share/pixmaps/gnome-db.png
+@dirrm share/omf/gnome-db
 @dirrm share/gnome/help/gnome-db/pt_BR/images
 @dirrm share/gnome/help/gnome-db/pt_BR
 @dirrm share/gnome/help/gnome-db/it/images
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index d3919468bdbf..95c2bb6eb639 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda/Makefile,v 1.2 2006/09/10 00:51:06 mezz Exp $
+#   $MCom: ports/databases/libgda/Makefile,v 1.5 2007/05/19 21:36:00 marcus Exp $
 #
 
 PORTNAME=	libgda
 PORTVERSION=	0.2.96
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
@@ -36,8 +36,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|share/idl|share/gnome/idl|g'
-
 .include <bsd.port.mk>
diff --git a/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
index 463f043f902c..36aee4bdb2cb 100644
--- a/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
+++ b/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
@@ -7,7 +7,7 @@ $FreeBSD$
  LDFLAGS = " 	$(GDA_CLIENT_LIBS) 	$(top_builddir)/lib/gda-common/.libs/libgda-common.so 	$(top_builddir)/lib/gda-client/.libs/libgda-client.a 	"
  
  
--DOC_DIR = $(datadir)/html
+-DOC_DIR = $(datadir)/gnome/html
 +DOC_DIR = $(prefix)/share/doc/libgda
  
  DOC_DIR_INSTALL_FILES =  	 libgda-client.args 	 libgda-client.hierarchy 	 libgda-client.signals		 libgda-client.types 	 libgda-client-decl.txt			 libgda-client-sections.txt
diff --git a/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
index 25b6b1ddc2e5..3e0a18cf3d33 100644
--- a/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
+++ b/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
@@ -7,7 +7,7 @@ $FreeBSD$
  LDFLAGS = " 	$(GDA_CLIENT_LIBS) 	$(top_builddir)/lib/gda-common/.libs/libgda-common.a 	"
  
  
--DOC_DIR = $(datadir)/html
+-DOC_DIR = $(datadir)/gnome/html
 +DOC_DIR = $(prefix)/share/doc/libgda
  
  DOC_DIR_INSTALL_FILES =  	 libgda-common.args 	 libgda-common.hierarchy 	 libgda-common.signals		 libgda-common.types 	 libgda-common-decl.txt			 libgda-common-sections.txt
diff --git a/databases/libgda/files/patch-tools::gda-buildserver.in b/databases/libgda/files/patch-tools::gda-buildserver.in
deleted file mode 100644
index fa75e2dcc31f..000000000000
--- a/databases/libgda/files/patch-tools::gda-buildserver.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/gda-buildserver.in	2001/08/06 08:16:41	1.1
-+++ tools/gda-buildserver.in	2001/08/06 08:16:54
-@@ -7,7 +7,7 @@
- CC=@CC@
- shell=@shell@
- 
--TEMPLATES_DIR="${prefix}/share/gda/templates"
-+TEMPLATES_DIR="${prefix}/share/gnome/gda/templates"
- TMPL_C_FILES="gda-srv-command.c gda-srv-connection.c gda-srv-recordset.c main-srv.c"
- TMPL_H_FILES="gda-srv.h"
- 
diff --git a/databases/libgda/files/patch-tools::templates::Makefile.in b/databases/libgda/files/patch-tools::templates::Makefile.in
deleted file mode 100644
index 2ca62bfb551d..000000000000
--- a/databases/libgda/files/patch-tools::templates::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/templates/Makefile.in	2001/08/06 08:15:18	1.1
-+++ tools/templates/Makefile.in	2001/08/06 08:15:53
-@@ -148,7 +148,7 @@
- 
- EXTRA_DIST = $(TEMPLATE_FILES)
- 
--gdatemplatesdir = $(prefix)/share/gda/templates
-+gdatemplatesdir = $(prefix)/share/gnome/gda/templates
- gdatemplates_DATA = $(TEMPLATE_FILES)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
diff --git a/databases/libgda/pkg-plist b/databases/libgda/pkg-plist
index 195f9aa7a656..7edb5f4b3516 100644
--- a/databases/libgda/pkg-plist
+++ b/databases/libgda/pkg-plist
@@ -74,11 +74,11 @@ lib/libgda-server.so.0
 %%DOCSDIR%%/libgda-common.hierarchy
 %%DOCSDIR%%/libgda-common.signals
 %%DOCSDIR%%/libgda-common.types
-share/gnome/gda/templates/gda-srv-command.c.tmpl
-share/gnome/gda/templates/gda-srv-connection.c.tmpl
-share/gnome/gda/templates/gda-srv-recordset.c.tmpl
-share/gnome/gda/templates/gda-srv.h.tmpl
-share/gnome/gda/templates/main-srv.c.tmpl
+share/gda/templates/gda-srv-command.c.tmpl
+share/gda/templates/gda-srv-connection.c.tmpl
+share/gda/templates/gda-srv-recordset.c.tmpl
+share/gda/templates/gda-srv.h.tmpl
+share/gda/templates/main-srv.c.tmpl
 share/gnome/help/libgda/C/architecture.html
 share/gnome/help/libgda/C/clients-building-corba.html
 share/gnome/help/libgda/C/clients-building.html
@@ -165,18 +165,14 @@ share/gnome/help/libgda/pt_BR/providers-actual-implementation.html
 share/gnome/help/libgda/pt_BR/providers-examples.html
 share/gnome/help/libgda/pt_BR/providers-implementation.html
 share/gnome/help/libgda/pt_BR/topic.dat
-share/gnome/idl/GDA.idl
-share/gnome/idl/GDA_Command.idl
-share/gnome/idl/GDA_Connection.idl
-share/gnome/idl/GDA_Error.idl
-share/gnome/idl/GDA_Field.idl
-share/gnome/idl/GDA_Listener.idl
-share/gnome/idl/GDA_Parameter.idl
-share/gnome/idl/GDA_Recordset.idl
-share/gnome/oaf/GNOME_GDA_Provider_Default.oaf
-share/gnome/omf/libgda/libgda-C.omf
-share/gnome/omf/libgda/libgda-es.omf
-share/gnome/omf/libgda/libgda-pt_BR.omf
+share/idl/GDA.idl
+share/idl/GDA_Command.idl
+share/idl/GDA_Connection.idl
+share/idl/GDA_Error.idl
+share/idl/GDA_Field.idl
+share/idl/GDA_Listener.idl
+share/idl/GDA_Parameter.idl
+share/idl/GDA_Recordset.idl
 share/locale/ca/LC_MESSAGES/libgda.mo
 share/locale/da/LC_MESSAGES/libgda.mo
 share/locale/de/LC_MESSAGES/libgda.mo
@@ -200,7 +196,11 @@ share/locale/sk/LC_MESSAGES/libgda.mo
 share/locale/sl/LC_MESSAGES/libgda.mo
 share/locale/sv/LC_MESSAGES/libgda.mo
 share/locale/uk/LC_MESSAGES/libgda.mo
-@dirrm share/gnome/omf/libgda
+share/oaf/GNOME_GDA_Provider_Default.oaf
+share/omf/libgda/libgda-C.omf
+share/omf/libgda/libgda-es.omf
+share/omf/libgda/libgda-pt_BR.omf
+@dirrm share/omf/libgda
 @dirrm share/gnome/help/libgda/pt_BR/images
 @dirrm share/gnome/help/libgda/pt_BR
 @dirrm share/gnome/help/libgda/es/images
@@ -208,8 +208,8 @@ share/locale/uk/LC_MESSAGES/libgda.mo
 @dirrm share/gnome/help/libgda/C/images
 @dirrm share/gnome/help/libgda/C
 @dirrm share/gnome/help/libgda
-@dirrm share/gnome/gda/templates
-@dirrm share/gnome/gda
+@dirrm share/gda/templates
+@dirrm share/gda
 @dirrm include/libgda-%%VERSION%%/gda++
 @dirrm include/libgda-%%VERSION%%/gda
 @dirrm include/libgda-%%VERSION%%
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 75da5884c391..1c7df563d32c 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda2/Makefile,v 1.35 2006/09/10 00:51:06 mezz Exp $
+#   $MCom: ports/databases/libgda2/Makefile,v 1.41 2007/10/21 03:13:52 mezz Exp $
 #
 
 PORTNAME=	libgda2
 PORTVERSION=	1.2.4
-PORTREVISION?=	1
+PORTREVISION?=	3
 PORTEPOCH?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -23,14 +23,13 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+    		rarian.0:${PORTSDIR}/textproc/rarian
 
 CONFLICTS=	libgda-0*
 
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack glib20 libxslt referencehack
+USE_GNOME=	gnomeprefix gnomehack glib20 libxslt referencehack intlhack
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 INSTALLS_OMF=	yes
@@ -61,8 +60,10 @@ WITH_MYSQL=	yes
 WITH_LDAP=yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libgds.so)
+.if exists(${LOCALBASE}/lib/libgds.so.1)
 WITH_FIREBIRD=	yes
+.elif exists(${LOCALBASE}/lib/libgds.so.2)
+WITHOUT_FIREBIRD=yes
 .endif
 
 .if exists(${LOCALBASE}/lib/libtds.so)
@@ -117,7 +118,7 @@ LIB_DEPENDS+=		gds.1:${PORTSDIR}/databases/firebird-client
 CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
 PLIST_SUB+=		FIREBIRD:=""
 .else
-CONFIGURE_ARGS+=	--without-interbase
+CONFIGURE_ARGS+=	--without-firebird
 PLIST_SUB+=		FIREBIRD:="@comment "
 .endif
 
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index f14263451fbd..f014a85934d3 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -109,11 +109,11 @@ lib/libgda/providers/libgda-xml.a
 lib/libgda/providers/libgda-xml.la
 lib/libgda/providers/libgda-xml.so
 libdata/pkgconfig/libgda.pc
-share/gnome/libgda/xml/gda-report.dtd
-share/gnome/libgda/xml/gda-report-result.dtd
-share/gnome/libgda/xml/gda-xml-query.dtd
-share/gnome/libgda/xml/gda-xml-query.xsl
-share/gnome/omf/libgda/libgda-C.omf
+share/libgda/xml/gda-report.dtd
+share/libgda/xml/gda-report-result.dtd
+share/libgda/xml/gda-xml-query.dtd
+share/libgda/xml/gda-xml-query.xsl
+share/omf/libgda/libgda-C.omf
 share/locale/az/LC_MESSAGES/libgda-2.mo
 share/locale/ca/LC_MESSAGES/libgda-2.mo
 share/locale/cs/LC_MESSAGES/libgda-2.mo
@@ -152,9 +152,9 @@ share/locale/uk/LC_MESSAGES/libgda-2.mo
 share/locale/vi/LC_MESSAGES/libgda-2.mo
 share/locale/zh_CN/LC_MESSAGES/libgda-2.mo
 share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
-@dirrm share/gnome/omf/libgda
-@dirrm share/gnome/libgda/xml
-@dirrm share/gnome/libgda
+@dirrm share/omf/libgda
+@dirrm share/libgda/xml
+@dirrm share/libgda
 @dirrm lib/libgda/providers
 @dirrm lib/libgda
 @dirrm include/libgda-%%VERSION%%/sql
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 694f16b53133..f06f03797dc4 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda3/Makefile,v 1.2 2006/09/10 00:51:06 mezz Exp $
+#   $MCom: ports/databases/libgda3/Makefile,v 1.5 2007/10/21 03:13:52 mezz Exp $
 #
 
 PORTNAME=	libgda3
 PORTVERSION=	1.9.102
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
@@ -58,6 +58,8 @@ WITH_LDAP=yes
 
 .if exists(${LOCALBASE}/lib/libgds.so.1)
 WITH_FIREBIRD=	yes
+.elif exists(${LOCALBASE}/lib/libgds.so.2)
+WITHOUT_FIREBIRD=yes
 .endif
 
 .if exists(${LOCALBASE}/lib/libtds.so.2)
@@ -112,7 +114,7 @@ LIB_DEPENDS+=		gds.1:${PORTSDIR}/databases/firebird-client
 CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
 PLIST_SUB+=		FIREBIRD:=""
 .else
-CONFIGURE_ARGS+=	--without-interbase
+CONFIGURE_ARGS+=	--without-firebird
 PLIST_SUB+=		FIREBIRD:="@comment "
 .endif
 
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index e40eaac353eb..5ef6181d8ff4 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -150,18 +150,18 @@ lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
 libdata/pkgconfig/libgda-2.0.pc
-share/gnome/libgda/dtd/libgda-array.dtd
-share/gnome/libgda/dtd/libgda-dict.dtd
-%%MYSQL:%%share/gnome/libgda/mysql_specs_create_db.xml
-%%MYSQL:%%share/gnome/libgda/mysql_specs_dsn.xml
-%%POSTGRES:%%share/gnome/libgda/postgres_specs_create_db.xml
-%%POSTGRES:%%share/gnome/libgda/postgres_specs_dsn.xml
-share/gnome/libgda/sqlite_specs_create_db.xml
-share/gnome/libgda/sqlite_specs_dsn.xml
-share/gnome/libgda/xml/gda-report.dtd
-share/gnome/libgda/xml/gda-report-result.dtd
-share/gnome/libgda/xml/gda-xml-query.dtd
-share/gnome/libgda/xml/gda-xml-query.xsl
+share/libgda/dtd/libgda-array.dtd
+share/libgda/dtd/libgda-dict.dtd
+%%MYSQL:%%share/libgda/mysql_specs_create_db.xml
+%%MYSQL:%%share/libgda/mysql_specs_dsn.xml
+%%POSTGRES:%%share/libgda/postgres_specs_create_db.xml
+%%POSTGRES:%%share/libgda/postgres_specs_dsn.xml
+share/libgda/sqlite_specs_create_db.xml
+share/libgda/sqlite_specs_dsn.xml
+share/libgda/xml/gda-report.dtd
+share/libgda/xml/gda-report-result.dtd
+share/libgda/xml/gda-xml-query.dtd
+share/libgda/xml/gda-xml-query.xsl
 share/locale/az/LC_MESSAGES/libgda-3.mo
 share/locale/ca/LC_MESSAGES/libgda-3.mo
 share/locale/cs/LC_MESSAGES/libgda-3.mo
@@ -205,9 +205,9 @@ share/locale/vi/LC_MESSAGES/libgda-3.mo
 share/locale/zh_CN/LC_MESSAGES/libgda-3.mo
 share/locale/zh_HK/LC_MESSAGES/libgda-3.mo
 share/locale/zh_TW/LC_MESSAGES/libgda-3.mo
-@dirrm share/gnome/libgda/xml
-@dirrm share/gnome/libgda/dtd
-@dirrm share/gnome/libgda
+@dirrm share/libgda/xml
+@dirrm share/libgda/dtd
+@dirrm share/libgda
 @dirrm lib/libgda-%%VERSION%%/providers
 @dirrm lib/libgda-%%VERSION%%
 @dirrm lib/libgda
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 8ca35d2e7df3..56a7786ccb0d 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgnomedb/Makefile,v 1.28 2006/09/10 00:51:06 mezz Exp $
+#   $MCom: ports/databases/libgnomedb/Makefile,v 1.30 2007/07/23 19:49:12 mezz Exp $
 #
 
 PORTNAME=	libgnomedb
 PORTVERSION=	1.9.102
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index cb5a90e9b64c..b7cc503799c6 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -102,43 +102,43 @@ lib/libgnomedb_handlers-3.la
 lib/libgnomedb_handlers-3.so
 lib/libgnomedb_handlers-3.so.4
 libdata/pkgconfig/libgnomedb-2.0.pc
-share/gnome/applications/database-properties.desktop
-share/gnome/mime-info/libgnomedb.keys
-share/gnome/mime-info/libgnomedb.mime
-share/gnome/omf/libgnomedb/libgnomedb-C.omf
-share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-commit_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-connect_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-database-login_48x48.png
-share/gnome/pixmaps/libgnomedb/gnome-db-database_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-database_48x48.png
-share/gnome/pixmaps/libgnomedb/gnome-db-designer_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-field_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-procedures_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-query_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-query_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-relations_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-relations_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-rollback_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-sequences_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-sql_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-sql_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-table_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-tables_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-tables_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-triggers_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-types_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-types_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-views_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-within-transaction_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db.png
+share/applications/database-properties.desktop
+share/mime-info/libgnomedb.keys
+share/mime-info/libgnomedb.mime
+share/omf/libgnomedb/libgnomedb-C.omf
+share/pixmaps/libgnomedb/gnome-db-aggregates_16x16.png
+share/pixmaps/libgnomedb/gnome-db-aggregates_24x24.png
+share/pixmaps/libgnomedb/gnome-db-commit_24x24.png
+share/pixmaps/libgnomedb/gnome-db-connect_24x24.png
+share/pixmaps/libgnomedb/gnome-db-database-login_48x48.png
+share/pixmaps/libgnomedb/gnome-db-database_16x16.png
+share/pixmaps/libgnomedb/gnome-db-database_24x24.png
+share/pixmaps/libgnomedb/gnome-db-database_48x48.png
+share/pixmaps/libgnomedb/gnome-db-designer_24x24.png
+share/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png
+share/pixmaps/libgnomedb/gnome-db-field_16x16.png
+share/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
+share/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png
+share/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
+share/pixmaps/libgnomedb/gnome-db-procedures_24x24.png
+share/pixmaps/libgnomedb/gnome-db-query_16x16.png
+share/pixmaps/libgnomedb/gnome-db-query_24x24.png
+share/pixmaps/libgnomedb/gnome-db-relations_16x16.png
+share/pixmaps/libgnomedb/gnome-db-relations_24x24.png
+share/pixmaps/libgnomedb/gnome-db-rollback_24x24.png
+share/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
+share/pixmaps/libgnomedb/gnome-db-sequences_24x24.png
+share/pixmaps/libgnomedb/gnome-db-sql_16x16.png
+share/pixmaps/libgnomedb/gnome-db-sql_24x24.png
+share/pixmaps/libgnomedb/gnome-db-table_16x16.png
+share/pixmaps/libgnomedb/gnome-db-tables_16x16.png
+share/pixmaps/libgnomedb/gnome-db-tables_24x24.png
+share/pixmaps/libgnomedb/gnome-db-triggers_16x16.png
+share/pixmaps/libgnomedb/gnome-db-types_16x16.png
+share/pixmaps/libgnomedb/gnome-db-types_24x24.png
+share/pixmaps/libgnomedb/gnome-db-views_16x16.png
+share/pixmaps/libgnomedb/gnome-db-within-transaction_24x24.png
+share/pixmaps/libgnomedb/gnome-db.png
 share/locale/az/LC_MESSAGES/libgnomedb-3.mo
 share/locale/be/LC_MESSAGES/libgnomedb-3.mo
 share/locale/ca/LC_MESSAGES/libgnomedb-3.mo
@@ -185,8 +185,8 @@ share/locale/vi/LC_MESSAGES/libgnomedb-3.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomedb-3.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomedb-3.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
-@dirrm share/gnome/pixmaps/libgnomedb
-@dirrm share/gnome/omf/libgnomedb
+@dirrm share/pixmaps/libgnomedb
+@dirrm share/omf/libgnomedb
 @dirrm lib/libgnomedb/plugins
 @dirrm lib/libgnomedb
 @dirrm include/libgnomedb-%%VERSION%%/libgnomedb/graph
@@ -197,3 +197,4 @@ share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 7bd1520e822d..9fc04dc0fa02 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mdbtools
 PORTVERSION=	0.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/databases/mdbtools/pkg-plist b/databases/mdbtools/pkg-plist
index b8d8fefdae8e..eef47c42b620 100644
--- a/databases/mdbtools/pkg-plist
+++ b/databases/mdbtools/pkg-plist
@@ -34,37 +34,37 @@ lib/libmdbsql.so.0
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%GNOME:%%share/gnome/gmdb/glade/code.xpm
-%%GNOME:%%share/gnome/gmdb/glade/debug.xpm
-%%GNOME:%%share/gnome/gmdb/glade/form_big.xpm
-%%GNOME:%%share/gnome/gmdb/glade/forms.xpm
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-debug.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-export.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-prefs.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-props.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-schema.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-sql-file.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-sql.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb.glade
-%%GNOME:%%share/gnome/gmdb/glade/logo.xpm
-%%GNOME:%%share/gnome/gmdb/glade/macro_big.xpm
-%%GNOME:%%share/gnome/gmdb/glade/macros.xpm
-%%GNOME:%%share/gnome/gmdb/glade/module_big.xpm
-%%GNOME:%%share/gnome/gmdb/glade/pk.xpm
-%%GNOME:%%share/gnome/gmdb/glade/query.xpm
-%%GNOME:%%share/gnome/gmdb/glade/query_big.xpm
-%%GNOME:%%share/gnome/gmdb/glade/report_big.xpm
-%%GNOME:%%share/gnome/gmdb/glade/reports.xpm
-%%GNOME:%%share/gnome/gmdb/glade/stock_export-16.png
-%%GNOME:%%share/gnome/gmdb/glade/stock_export.png
-%%GNOME:%%share/gnome/gmdb/glade/table.xpm
-%%GNOME:%%share/gnome/gmdb/glade/table_big.xpm
+%%GNOME:%%share/gmdb/glade/code.xpm
+%%GNOME:%%share/gmdb/glade/debug.xpm
+%%GNOME:%%share/gmdb/glade/form_big.xpm
+%%GNOME:%%share/gmdb/glade/forms.xpm
+%%GNOME:%%share/gmdb/glade/gmdb-debug.glade
+%%GNOME:%%share/gmdb/glade/gmdb-export.glade
+%%GNOME:%%share/gmdb/glade/gmdb-prefs.glade
+%%GNOME:%%share/gmdb/glade/gmdb-props.glade
+%%GNOME:%%share/gmdb/glade/gmdb-schema.glade
+%%GNOME:%%share/gmdb/glade/gmdb-sql-file.glade
+%%GNOME:%%share/gmdb/glade/gmdb-sql.glade
+%%GNOME:%%share/gmdb/glade/gmdb.glade
+%%GNOME:%%share/gmdb/glade/logo.xpm
+%%GNOME:%%share/gmdb/glade/macro_big.xpm
+%%GNOME:%%share/gmdb/glade/macros.xpm
+%%GNOME:%%share/gmdb/glade/module_big.xpm
+%%GNOME:%%share/gmdb/glade/pk.xpm
+%%GNOME:%%share/gmdb/glade/query.xpm
+%%GNOME:%%share/gmdb/glade/query_big.xpm
+%%GNOME:%%share/gmdb/glade/report_big.xpm
+%%GNOME:%%share/gmdb/glade/reports.xpm
+%%GNOME:%%share/gmdb/glade/stock_export-16.png
+%%GNOME:%%share/gmdb/glade/stock_export.png
+%%GNOME:%%share/gmdb/glade/table.xpm
+%%GNOME:%%share/gmdb/glade/table_big.xpm
 %%GNOME:%%share/gnome/help/gmdb/C/figures/gmdb2_window.png
 %%GNOME:%%share/gnome/help/gmdb/C/gmdb.xml
 %%GNOME:%%share/gnome/help/gmdb/C/legal.xml
 %%GNOME:%%@dirrm share/gnome/help/gmdb/C/figures
 %%GNOME:%%@dirrm share/gnome/help/gmdb/C
 %%GNOME:%%@dirrm share/gnome/help/gmdb
-%%GNOME:%%@dirrm share/gnome/gmdb/glade
-%%GNOME:%%@dirrm share/gnome/gmdb
+%%GNOME:%%@dirrm share/gmdb/glade
+%%GNOME:%%@dirrm share/gmdb
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/databases/mysql-query-browser/Makefile b/databases/mysql-query-browser/Makefile
index de8095505d16..ddb77ae98a93 100644
--- a/databases/mysql-query-browser/Makefile
+++ b/databases/mysql-query-browser/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mysql-query-browser
 PORTVERSION=	1.1.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQLAdministrationSuite
@@ -16,15 +16,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A database querying tool for MySQL servers
 
 LIB_DEPENDS=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		pcre.0:${PORTSDIR}/devel/pcre
+		pcre.0:${PORTSDIR}/devel/pcre \
+		rarian.0:${PORTSDIR}/textproc/rarian
 BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed \
 		gtkdoc-mkhtml:${PORTSDIR}/textproc/gtk-doc \
-		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-
-BROKEN=		fails to fetch
-DEPRECATED=	"${BROKEN}"
-EXPIRATION_DATE=	2007-12-24
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
@@ -40,7 +35,7 @@ IGNORE_WITH_MYSQL=	323
 GTKHTML_VER=	${gtkhtml3_DETECT:R}
 CONFIGURE_ARGS_GUI=	--prefix=${X11BASE} \
 			--datadir=${DATADIR} \
-			--localstatedir=${PREFIX}/share/gnome
+			--localstatedir=${PREFIX}/share
 CONFIGURE_ARGS_MAIN=	${CONFIGURE_ARGS_GUI} \
 			--with-gtkhtml=${GTKHTML_VER:C/^.*\///g}
 
@@ -81,12 +76,4 @@ do-install:
 	@cd ${MAIN_DIR}; \
 	${GMAKE} ${INSTALL_TARGET}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 0fc7a77391cc..28b5271df949 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/anjuta-devel/Makefile,v 1.14 2006/09/10 00:51:07 mezz Exp $
+#   $MCom: ports/devel/anjuta/Makefile,v 1.13 2007/09/07 05:03:33 marcus Exp $
 #
 
 PORTNAME=	anjuta
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
@@ -20,7 +21,7 @@ BUILD_DEPENDS=	autogen:${PORTSDIR}/devel/autogen \
 		neato:${PORTSDIR}/graphics/graphviz
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 		gbf-1.1:${PORTSDIR}/devel/gnome-build \
-		gladeui-1.5:${PORTSDIR}/devel/glade3 \
+		gladeui-1.7:${PORTSDIR}/devel/glade3 \
 		devhelp-1.0:${PORTSDIR}/devel/devhelp
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		autogen:${PORTSDIR}/devel/autogen \
@@ -66,13 +67,10 @@ PLIST_SUB+=	SVN="@comment "
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash| ; \
-	    	s|/usr/local|${PREFIX}| ; \
-		s|share/anjuta|share/gnome/anjuta|' \
+	    	s|/usr/local|${PREFIX}|' \
 	    	${WRKSRC}/global-tags/create_global_tags.sh
 	@${REINPLACE_CMD} -e 's|PKG_PATH|PKG_CONFIG_PATH|g' \
 	    	${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|[(]datadir[)]/icons/gnome|(prefix)/share/icons/gnome|g' \
-	    	${WRKSRC}/mime/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/anjuta/files/patch-plugins_glade_pluginc.c b/devel/anjuta/files/patch-plugins_glade_pluginc.c
new file mode 100644
index 000000000000..569bafe71633
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_glade_pluginc.c
@@ -0,0 +1,113 @@
+--- plugins/glade/plugin.c	2007/06/20 02:18:37	3013
++++ plugins/glade/plugin.c	2007/07/07 13:25:08	3048
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#if (GLADEUI_VERSION <= 302)
++#if (GLADEUI_VERSION <= 303)
+ # include <glade.h>
+ #else
+ # if (GLADEUI_VERSION <= 314)
+@@ -54,7 +54,7 @@
+ 	GtkActionGroup *action_group;
+ 	GladeApp  *gpw;
+ 	GtkWidget *inspector;
+-#if (GLADEUI_VERSION > 302)
++#if (GLADEUI_VERSION > 303)
+ 	GtkWidget *design_notebook;
+ #endif
+ 	GtkWidget *view_box;
+@@ -428,7 +428,7 @@
+ static void
+ glade_do_close (GladePlugin *plugin, GladeProject *project)
+ {
+-#if (GLADEUI_VERSION > 302)
++#if (GLADEUI_VERSION > 303)
+ 	GtkWidget *design_view;
+ 
+ 	design_view = g_object_get_data (G_OBJECT (project), "design_view");
+@@ -459,7 +459,11 @@
+ 	}
+ 	
+ #if (GLADEUI_VERSION >= 330)
+-	if (glade_project_get_has_unsaved_changes (project))
++#  if (GLADEUI_VERSION > 331)
++	if (glade_project_get_modified (project))
++#  else
++ 	if (glade_project_get_has_unsaved_changes (project))
++#  endif
+ #else
+ 	if (project->changed)
+ #endif
+@@ -502,14 +506,14 @@
+ 	{
+ 		GladeProject *project;
+ 		
+-#if (GLADEUI_VERSION > 302)
++#if (GLADEUI_VERSION > 303)
+ 		GtkWidget *design_view;
+ 		gint design_pagenum;
+ #endif
+ 		gtk_tree_model_get (model, &iter, PROJECT_COL, &project, -1);
+ 		glade_app_set_project (project);
+ 		
+-#if (GLADEUI_VERSION > 302)
++#if (GLADEUI_VERSION > 303)
+ 		design_view = g_object_get_data (G_OBJECT (project), "design_view");
+ 		design_pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (plugin->priv->design_notebook),
+ 												design_view);
+@@ -713,7 +717,7 @@
+ 	gtk_container_remove (GTK_CONTAINER (parent), wid);
+ }
+ 
+-#if (GLADEUI_VERSION > 302)
++#if (GLADEUI_VERSION > 303)
+ static void
+ glade_plugin_add_project (GladePlugin *glade_plugin, GladeProject *project)
+ {
+@@ -796,7 +800,7 @@
+ 		g_object_unref (G_OBJECT (store));
+ 		gtk_box_pack_start (GTK_BOX (priv->view_box), priv->projects_combo,
+ 							FALSE, FALSE, 0);
+-#if (GLADEUI_VERSION > 302)
++#if (GLADEUI_VERSION > 303)
+ #  if (GLADEUI_VERSION >= 330)
+         priv->inspector = glade_inspector_new ();
+         
+@@ -825,7 +829,7 @@
+ 		gtk_notebook_popup_enable (GTK_NOTEBOOK (glade_app_get_editor ()->notebook));
+ 
+ 		
+-#if (GLADEUI_VERSION > 302)
++#if (GLADEUI_VERSION > 303)
+ 		/* Create design_notebook */
+ 		priv->design_notebook = gtk_notebook_new ();
+ 		gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->design_notebook), FALSE);
+@@ -862,7 +866,7 @@
+ 	g_object_ref (glade_app_get_palette ());
+ 	g_object_ref (glade_app_get_editor ());
+ 	g_object_ref (priv->view_box);
+-#if (GLADEUI_VERSION > 302)
++#if (GLADEUI_VERSION > 303)
+ 	g_object_ref (priv->design_notebook);
+ #endif
+ 	gtk_widget_show (GTK_WIDGET (glade_app_get_palette ()));
+@@ -884,7 +888,7 @@
+ 							 "AnjutaGladeEditor", _("Properties"),
+ 							 "glade-plugin-icon",
+ 							 ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
+-#if (GLADEUI_VERSION > 302)
++#if (GLADEUI_VERSION > 303)
+ 	anjuta_shell_add_widget (ANJUTA_PLUGIN (plugin)->shell,
+ 							 GTK_WIDGET (priv->design_notebook),
+ 							 "AnjutaGladeDesigner", _("Designer"),
+@@ -935,7 +939,7 @@
+ 	anjuta_shell_remove_widget (plugin->shell,
+ 								GTK_WIDGET (priv->view_box),
+ 								NULL);
+-#if (GLADEUI_VERSION > 302)
++#if (GLADEUI_VERSION > 303)
+ 	anjuta_shell_remove_widget (plugin->shell,
+ 								GTK_WIDGET (priv->design_notebook),
+ 								NULL);
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index bcef95e48b0e..ecc2d183247d 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -286,246 +286,246 @@ share/doc/libanjuta/writing-plugins-build-setup.html
 share/doc/libanjuta/writing-plugins-simple.html
 share/doc/libanjuta/writing-plugins-sources.html
 share/doc/libanjuta/writing-plugins.html
-share/gnome/anjuta/AUTHORS
-share/gnome/anjuta/anjuta_project.template
-share/gnome/anjuta/build/automake-c.filters
-share/gnome/anjuta/class-templates/cc-header.tpl
-share/gnome/anjuta/class-templates/cc-source.tpl
-share/gnome/anjuta/class-templates/go-header.tpl
-share/gnome/anjuta/class-templates/go-source.tpl
-share/gnome/anjuta/gdb.init
-share/gnome/anjuta/glade/anjuta-build-basic-autotools-plugin.glade
-share/gnome/anjuta/glade/anjuta-class-gen-plugin.glade
-share/gnome/anjuta/glade/anjuta-cvs-plugin.glade
-share/gnome/anjuta/glade/anjuta-debug-manager.glade
-share/gnome/anjuta/glade/anjuta-document-manager.glade
-share/gnome/anjuta/glade/anjuta-file-manager-plugin.glade
-share/gnome/anjuta/glade/anjuta-file-wizard.glade
-share/gnome/anjuta/glade/anjuta-gdb.glade
-share/gnome/anjuta/glade/anjuta-language-cpp-java.glade
-share/gnome/anjuta/glade/anjuta-macro.glade
-share/gnome/anjuta/glade/anjuta-message-manager-plugin.glade
-share/gnome/anjuta/glade/anjuta-project-import.glade
-share/gnome/anjuta/glade/anjuta-project-wizard.glade
-share/gnome/anjuta/glade/anjuta-search.glade
-%%SVN%%share/gnome/anjuta/glade/anjuta-subversion.glade
-share/gnome/anjuta/glade/anjuta-symbol-browser-plugin.glade
-share/gnome/anjuta/glade/anjuta-terminal-plugin.glade
-share/gnome/anjuta/glade/anjuta-tools.glade
-share/gnome/anjuta/glade/anjuta.glade
-share/gnome/anjuta/glade/applogo.png
-share/gnome/anjuta/glade/appwizard.png
-share/gnome/anjuta/glade/editor.glade
-share/gnome/anjuta/glade/layout.glade
-share/gnome/anjuta/glade/patch-plugin.glade
-share/gnome/anjuta/glade/profiler-call-graph.glade
-share/gnome/anjuta/glade/profiler-flat-profile.glade
-share/gnome/anjuta/glade/profiler-function-call-tree.glade
-share/gnome/anjuta/glade/profiler.glade
-share/gnome/anjuta/glade/sourceview.glade
-share/gnome/anjuta/glade/start-with-import.png
-share/gnome/anjuta/glade/start-with-open.png
-share/gnome/anjuta/glade/start-with-wizard.png
-share/gnome/anjuta/gtodo/gtodo.css
-share/gnome/anjuta/gtodo/gtodo.xsl
-share/gnome/anjuta/indent_test.c
-share/gnome/anjuta/layout.xml
-share/gnome/anjuta/macros.xml
-share/gnome/anjuta/profiles/default.profile
-share/gnome/anjuta/project/anjuta-plugin-logo.png
-share/gnome/anjuta/project/anjuta-plugin.wiz
-share/gnome/anjuta/project/anjuta-plugin/configure.ac.tpl
-share/gnome/anjuta/project/anjuta-plugin/po/POTFILES.in
-share/gnome/anjuta/project/anjuta-plugin/src/Makefile.am.tpl
-share/gnome/anjuta/project/anjuta-plugin/src/plugin.c
-share/gnome/anjuta/project/anjuta-plugin/src/plugin.glade
-share/gnome/anjuta/project/anjuta-plugin/src/plugin.h
-share/gnome/anjuta/project/anjuta-plugin/src/plugin.plugin.in
-share/gnome/anjuta/project/anjuta-plugin/src/plugin.ui
-share/gnome/anjuta/project/appwiz_sdl.png
-share/gnome/anjuta/project/cpp-logo.png
-share/gnome/anjuta/project/cpp.wiz
-share/gnome/anjuta/project/cpp/configure.ac.tpl
-share/gnome/anjuta/project/cpp/po/POTFILES.in
-share/gnome/anjuta/project/cpp/src/Makefile.am.tpl
-share/gnome/anjuta/project/cpp/src/cvsignore
-share/gnome/anjuta/project/cpp/src/main.cc
-share/gnome/anjuta/project/django-logo.png
-share/gnome/anjuta/project/django.wiz
-share/gnome/anjuta/project/gcj-logo.png
-share/gnome/anjuta/project/gcj.wiz
-share/gnome/anjuta/project/gcj/configure.ac.tpl
-share/gnome/anjuta/project/gcj/src/Makefile.am.tpl
-share/gnome/anjuta/project/gnome-logo.png
-share/gnome/anjuta/project/gnome.wiz
-share/gnome/anjuta/project/gnome/po/POTFILES.in
-share/gnome/anjuta/project/gnome/src/Makefile.am.tpl
-share/gnome/anjuta/project/gnome/src/callbacks.c
-share/gnome/anjuta/project/gnome/src/callbacks.h
-share/gnome/anjuta/project/gnome/src/main.c
-share/gnome/anjuta/project/gnome/src/project.glade
-share/gnome/anjuta/project/gtk-logo.png
-share/gnome/anjuta/project/gtk.wiz
-share/gnome/anjuta/project/gtk/po/POTFILES.in
-share/gnome/anjuta/project/gtk/src/Makefile.am.tpl
-share/gnome/anjuta/project/gtk/src/callbacks.c
-share/gnome/anjuta/project/gtk/src/callbacks.h
-share/gnome/anjuta/project/gtk/src/main.c
-share/gnome/anjuta/project/gtk/src/project.glade
-share/gnome/anjuta/project/gtkmm-logo.png
-share/gnome/anjuta/project/gtkmm.wiz
-share/gnome/anjuta/project/gtkmm/po/POTFILES.in
-share/gnome/anjuta/project/gtkmm/src/Makefile.am.tpl
-share/gnome/anjuta/project/gtkmm/src/main.cc
-share/gnome/anjuta/project/gtkmm/src/project.glade
-share/gnome/anjuta/project/java-logo.png
-share/gnome/anjuta/project/java.wiz
-share/gnome/anjuta/project/java/configure.ac.tpl
-share/gnome/anjuta/project/java/po/POTFILES.in
-share/gnome/anjuta/project/java/project.anjuta
-share/gnome/anjuta/project/java/src/Makefile.am.tpl
-share/gnome/anjuta/project/java/src/main.java
-share/gnome/anjuta/project/minimal.wiz
-share/gnome/anjuta/project/minimal/Makefile.am.tpl
-share/gnome/anjuta/project/minimal/autogen.sh
-share/gnome/anjuta/project/minimal/configure.ac.tpl
-share/gnome/anjuta/project/minimal/project.anjuta
-share/gnome/anjuta/project/mkfile-logo.png
-share/gnome/anjuta/project/mkfile.wiz
-share/gnome/anjuta/project/mkfile/po/ChangeLog
-share/gnome/anjuta/project/mkfile/po/POTFILES.in
-share/gnome/anjuta/project/mkfile/project.anjuta
-share/gnome/anjuta/project/mkfile/src/Makefile.tpl
-share/gnome/anjuta/project/mkfile/src/main.c
-share/gnome/anjuta/project/python-logo.png
-share/gnome/anjuta/project/python.wiz
-share/gnome/anjuta/project/python/configure.ac.tpl
-share/gnome/anjuta/project/python/po/POTFILES.in
-share/gnome/anjuta/project/python/project.anjuta
-share/gnome/anjuta/project/python/src/Makefile.am.tpl
-share/gnome/anjuta/project/python/src/main.py
-share/gnome/anjuta/project/sdl.wiz
-share/gnome/anjuta/project/sdl/acinclude.m4.tpl
-share/gnome/anjuta/project/sdl/configure.ac.tpl
-share/gnome/anjuta/project/sdl/po/POTFILES.in
-share/gnome/anjuta/project/sdl/src/Makefile.am.tpl
-share/gnome/anjuta/project/sdl/src/main.c
-share/gnome/anjuta/project/terminal-logo.png
-share/gnome/anjuta/project/terminal.wiz
-share/gnome/anjuta/project/terminal/AUTHORS
-share/gnome/anjuta/project/terminal/ChangeLog
-share/gnome/anjuta/project/terminal/Makefile.am.tpl
-share/gnome/anjuta/project/terminal/NEWS
-share/gnome/anjuta/project/terminal/README
-share/gnome/anjuta/project/terminal/autogen.sh
-share/gnome/anjuta/project/terminal/configure.ac.tpl
-share/gnome/anjuta/project/terminal/cvsignore
-share/gnome/anjuta/project/terminal/po/ChangeLog
-share/gnome/anjuta/project/terminal/po/LINGUAS
-share/gnome/anjuta/project/terminal/po/POTFILES.in
-share/gnome/anjuta/project/terminal/po/cvsignore
-share/gnome/anjuta/project/terminal/project.anjuta
-share/gnome/anjuta/project/terminal/src/Makefile.am.tpl
-share/gnome/anjuta/project/terminal/src/cvsignore
-share/gnome/anjuta/project/terminal/src/main.c
-share/gnome/anjuta/project/wxwin-logo.png
-share/gnome/anjuta/project/wxwin.wiz
-share/gnome/anjuta/project/wxwin/configure.ac.tpl
-share/gnome/anjuta/project/wxwin/po/POTFILES.in
-share/gnome/anjuta/project/wxwin/src/Makefile.am.tpl
-share/gnome/anjuta/project/wxwin/src/main.cc
-share/gnome/anjuta/project/xlib-dock.wiz
-share/gnome/anjuta/project/xlib-dock/po/POTFILES.in
-share/gnome/anjuta/project/xlib-dock/src/Makefile.am.tpl
-share/gnome/anjuta/project/xlib-dock/src/main.c
-share/gnome/anjuta/project/xlib-dock/src/pixmaps.h
-share/gnome/anjuta/project/xlib-dock/src/wmgeneral.c
-share/gnome/anjuta/project/xlib-dock/src/wmgeneral.h
-share/gnome/anjuta/project/xlib-logo.png
-share/gnome/anjuta/project/xlib.wiz
-share/gnome/anjuta/project/xlib/configure.ac.tpl
-share/gnome/anjuta/project/xlib/po/POTFILES.in
-share/gnome/anjuta/project/xlib/src/Makefile.am.tpl
-share/gnome/anjuta/project/xlib/src/main.c
-share/gnome/anjuta/properties/Embedded.properties
-share/gnome/anjuta/properties/SciTEGlobal.properties
-share/gnome/anjuta/properties/ada.properties
-share/gnome/anjuta/properties/anjuta.properties
-share/gnome/anjuta/properties/asm.properties
-share/gnome/anjuta/properties/asn1.properties
-share/gnome/anjuta/properties/au3.properties
-share/gnome/anjuta/properties/ave.properties
-share/gnome/anjuta/properties/baan.properties
-share/gnome/anjuta/properties/bullant.properties
-share/gnome/anjuta/properties/conf.properties
-share/gnome/anjuta/properties/cpp.properties
-share/gnome/anjuta/properties/css.properties
-share/gnome/anjuta/properties/eiffel.properties
-share/gnome/anjuta/properties/erlang.properties
-share/gnome/anjuta/properties/escript.properties
-share/gnome/anjuta/properties/forth.properties
-share/gnome/anjuta/properties/fortran.properties
-share/gnome/anjuta/properties/html.properties
-share/gnome/anjuta/properties/kix.properties
-share/gnome/anjuta/properties/latex.properties
-share/gnome/anjuta/properties/lisp.properties
-share/gnome/anjuta/properties/lot.properties
-share/gnome/anjuta/properties/lout.properties
-share/gnome/anjuta/properties/lua.properties
-share/gnome/anjuta/properties/matlab.properties
-share/gnome/anjuta/properties/metapost.properties
-share/gnome/anjuta/properties/mmixal.properties
-share/gnome/anjuta/properties/nncrontab.properties
-share/gnome/anjuta/properties/nsis.properties
-share/gnome/anjuta/properties/others.properties
-share/gnome/anjuta/properties/pascal.properties
-share/gnome/anjuta/properties/perl.properties
-share/gnome/anjuta/properties/pov.properties
-share/gnome/anjuta/properties/ps.properties
-share/gnome/anjuta/properties/python.properties
-share/gnome/anjuta/properties/ruby.properties
-share/gnome/anjuta/properties/scriptol.properties
-share/gnome/anjuta/properties/specman.properties
-share/gnome/anjuta/properties/sql.properties
-share/gnome/anjuta/properties/styles.properties
-share/gnome/anjuta/properties/tcl.properties
-share/gnome/anjuta/properties/tex.properties
-share/gnome/anjuta/properties/user.properties
-share/gnome/anjuta/properties/vb.properties
-share/gnome/anjuta/properties/verilog.properties
-share/gnome/anjuta/properties/vhdl.properties
-share/gnome/anjuta/properties/yaml.properties
-share/gnome/anjuta/scripts/anjuta-tags
-share/gnome/anjuta/scripts/create_global_tags.sh
-share/gnome/anjuta/tools/find-fixmes.pl
-share/gnome/anjuta/tools/prepare-changelog.pl
-share/gnome/anjuta/tools/tools-2.xml
-share/gnome/anjuta/tools/translation-status.pl
-share/gnome/anjuta/ui/anjuta-build-basic-autotools-plugin.ui
-share/gnome/anjuta/ui/anjuta-cvs.ui
-share/gnome/anjuta/ui/anjuta-debug-manager.ui
-share/gnome/anjuta/ui/anjuta-devhelp-simple.ui
-share/gnome/anjuta/ui/anjuta-devhelp.ui
-share/gnome/anjuta/ui/anjuta-document-manager.ui
-share/gnome/anjuta/ui/anjuta-file-manager.ui
-share/gnome/anjuta/ui/anjuta-glade.ui
-share/gnome/anjuta/ui/anjuta-gtodo.ui
-share/gnome/anjuta/ui/anjuta-language-support-cpp-java.ui
-share/gnome/anjuta/ui/anjuta-loader-plugin.ui
-share/gnome/anjuta/ui/anjuta-macro.ui
-share/gnome/anjuta/ui/anjuta-message-manager.ui
-share/gnome/anjuta/ui/anjuta-patch.ui
-share/gnome/anjuta/ui/anjuta-project-manager.ui
-share/gnome/anjuta/ui/anjuta-sample.ui
-share/gnome/anjuta/ui/anjuta-search.ui
-share/gnome/anjuta/ui/anjuta-shell.ui
-%%SVN%%share/gnome/anjuta/ui/anjuta-subversion.ui
-share/gnome/anjuta/ui/anjuta-symbol-browser-plugin.ui
-share/gnome/anjuta/ui/anjuta-tools.ui
-share/gnome/anjuta/ui/anjuta.ui
-share/gnome/anjuta/ui/profiler.ui
-share/gnome/anjuta/welcome.txt
-share/gnome/applications/anjuta.desktop
+share/anjuta/AUTHORS
+share/anjuta/anjuta_project.template
+share/anjuta/build/automake-c.filters
+share/anjuta/class-templates/cc-header.tpl
+share/anjuta/class-templates/cc-source.tpl
+share/anjuta/class-templates/go-header.tpl
+share/anjuta/class-templates/go-source.tpl
+share/anjuta/gdb.init
+share/anjuta/glade/anjuta-build-basic-autotools-plugin.glade
+share/anjuta/glade/anjuta-class-gen-plugin.glade
+share/anjuta/glade/anjuta-cvs-plugin.glade
+share/anjuta/glade/anjuta-debug-manager.glade
+share/anjuta/glade/anjuta-document-manager.glade
+share/anjuta/glade/anjuta-file-manager-plugin.glade
+share/anjuta/glade/anjuta-file-wizard.glade
+share/anjuta/glade/anjuta-gdb.glade
+share/anjuta/glade/anjuta-language-cpp-java.glade
+share/anjuta/glade/anjuta-macro.glade
+share/anjuta/glade/anjuta-message-manager-plugin.glade
+share/anjuta/glade/anjuta-project-import.glade
+share/anjuta/glade/anjuta-project-wizard.glade
+share/anjuta/glade/anjuta-search.glade
+%%SVN%%share/anjuta/glade/anjuta-subversion.glade
+share/anjuta/glade/anjuta-symbol-browser-plugin.glade
+share/anjuta/glade/anjuta-terminal-plugin.glade
+share/anjuta/glade/anjuta-tools.glade
+share/anjuta/glade/anjuta.glade
+share/anjuta/glade/applogo.png
+share/anjuta/glade/appwizard.png
+share/anjuta/glade/editor.glade
+share/anjuta/glade/layout.glade
+share/anjuta/glade/patch-plugin.glade
+share/anjuta/glade/profiler-call-graph.glade
+share/anjuta/glade/profiler-flat-profile.glade
+share/anjuta/glade/profiler-function-call-tree.glade
+share/anjuta/glade/profiler.glade
+share/anjuta/glade/sourceview.glade
+share/anjuta/glade/start-with-import.png
+share/anjuta/glade/start-with-open.png
+share/anjuta/glade/start-with-wizard.png
+share/anjuta/gtodo/gtodo.css
+share/anjuta/gtodo/gtodo.xsl
+share/anjuta/indent_test.c
+share/anjuta/layout.xml
+share/anjuta/macros.xml
+share/anjuta/profiles/default.profile
+share/anjuta/project/anjuta-plugin-logo.png
+share/anjuta/project/anjuta-plugin.wiz
+share/anjuta/project/anjuta-plugin/configure.ac.tpl
+share/anjuta/project/anjuta-plugin/po/POTFILES.in
+share/anjuta/project/anjuta-plugin/src/Makefile.am.tpl
+share/anjuta/project/anjuta-plugin/src/plugin.c
+share/anjuta/project/anjuta-plugin/src/plugin.glade
+share/anjuta/project/anjuta-plugin/src/plugin.h
+share/anjuta/project/anjuta-plugin/src/plugin.plugin.in
+share/anjuta/project/anjuta-plugin/src/plugin.ui
+share/anjuta/project/appwiz_sdl.png
+share/anjuta/project/cpp-logo.png
+share/anjuta/project/cpp.wiz
+share/anjuta/project/cpp/configure.ac.tpl
+share/anjuta/project/cpp/po/POTFILES.in
+share/anjuta/project/cpp/src/Makefile.am.tpl
+share/anjuta/project/cpp/src/cvsignore
+share/anjuta/project/cpp/src/main.cc
+share/anjuta/project/django-logo.png
+share/anjuta/project/django.wiz
+share/anjuta/project/gcj-logo.png
+share/anjuta/project/gcj.wiz
+share/anjuta/project/gcj/configure.ac.tpl
+share/anjuta/project/gcj/src/Makefile.am.tpl
+share/anjuta/project/gnome-logo.png
+share/anjuta/project/gnome.wiz
+share/anjuta/project/gnome/po/POTFILES.in
+share/anjuta/project/gnome/src/Makefile.am.tpl
+share/anjuta/project/gnome/src/callbacks.c
+share/anjuta/project/gnome/src/callbacks.h
+share/anjuta/project/gnome/src/main.c
+share/anjuta/project/gnome/src/project.glade
+share/anjuta/project/gtk-logo.png
+share/anjuta/project/gtk.wiz
+share/anjuta/project/gtk/po/POTFILES.in
+share/anjuta/project/gtk/src/Makefile.am.tpl
+share/anjuta/project/gtk/src/callbacks.c
+share/anjuta/project/gtk/src/callbacks.h
+share/anjuta/project/gtk/src/main.c
+share/anjuta/project/gtk/src/project.glade
+share/anjuta/project/gtkmm-logo.png
+share/anjuta/project/gtkmm.wiz
+share/anjuta/project/gtkmm/po/POTFILES.in
+share/anjuta/project/gtkmm/src/Makefile.am.tpl
+share/anjuta/project/gtkmm/src/main.cc
+share/anjuta/project/gtkmm/src/project.glade
+share/anjuta/project/java-logo.png
+share/anjuta/project/java.wiz
+share/anjuta/project/java/configure.ac.tpl
+share/anjuta/project/java/po/POTFILES.in
+share/anjuta/project/java/project.anjuta
+share/anjuta/project/java/src/Makefile.am.tpl
+share/anjuta/project/java/src/main.java
+share/anjuta/project/minimal.wiz
+share/anjuta/project/minimal/Makefile.am.tpl
+share/anjuta/project/minimal/autogen.sh
+share/anjuta/project/minimal/configure.ac.tpl
+share/anjuta/project/minimal/project.anjuta
+share/anjuta/project/mkfile-logo.png
+share/anjuta/project/mkfile.wiz
+share/anjuta/project/mkfile/po/ChangeLog
+share/anjuta/project/mkfile/po/POTFILES.in
+share/anjuta/project/mkfile/project.anjuta
+share/anjuta/project/mkfile/src/Makefile.tpl
+share/anjuta/project/mkfile/src/main.c
+share/anjuta/project/python-logo.png
+share/anjuta/project/python.wiz
+share/anjuta/project/python/configure.ac.tpl
+share/anjuta/project/python/po/POTFILES.in
+share/anjuta/project/python/project.anjuta
+share/anjuta/project/python/src/Makefile.am.tpl
+share/anjuta/project/python/src/main.py
+share/anjuta/project/sdl.wiz
+share/anjuta/project/sdl/acinclude.m4.tpl
+share/anjuta/project/sdl/configure.ac.tpl
+share/anjuta/project/sdl/po/POTFILES.in
+share/anjuta/project/sdl/src/Makefile.am.tpl
+share/anjuta/project/sdl/src/main.c
+share/anjuta/project/terminal-logo.png
+share/anjuta/project/terminal.wiz
+share/anjuta/project/terminal/AUTHORS
+share/anjuta/project/terminal/ChangeLog
+share/anjuta/project/terminal/Makefile.am.tpl
+share/anjuta/project/terminal/NEWS
+share/anjuta/project/terminal/README
+share/anjuta/project/terminal/autogen.sh
+share/anjuta/project/terminal/configure.ac.tpl
+share/anjuta/project/terminal/cvsignore
+share/anjuta/project/terminal/po/ChangeLog
+share/anjuta/project/terminal/po/LINGUAS
+share/anjuta/project/terminal/po/POTFILES.in
+share/anjuta/project/terminal/po/cvsignore
+share/anjuta/project/terminal/project.anjuta
+share/anjuta/project/terminal/src/Makefile.am.tpl
+share/anjuta/project/terminal/src/cvsignore
+share/anjuta/project/terminal/src/main.c
+share/anjuta/project/wxwin-logo.png
+share/anjuta/project/wxwin.wiz
+share/anjuta/project/wxwin/configure.ac.tpl
+share/anjuta/project/wxwin/po/POTFILES.in
+share/anjuta/project/wxwin/src/Makefile.am.tpl
+share/anjuta/project/wxwin/src/main.cc
+share/anjuta/project/xlib-dock.wiz
+share/anjuta/project/xlib-dock/po/POTFILES.in
+share/anjuta/project/xlib-dock/src/Makefile.am.tpl
+share/anjuta/project/xlib-dock/src/main.c
+share/anjuta/project/xlib-dock/src/pixmaps.h
+share/anjuta/project/xlib-dock/src/wmgeneral.c
+share/anjuta/project/xlib-dock/src/wmgeneral.h
+share/anjuta/project/xlib-logo.png
+share/anjuta/project/xlib.wiz
+share/anjuta/project/xlib/configure.ac.tpl
+share/anjuta/project/xlib/po/POTFILES.in
+share/anjuta/project/xlib/src/Makefile.am.tpl
+share/anjuta/project/xlib/src/main.c
+share/anjuta/properties/Embedded.properties
+share/anjuta/properties/SciTEGlobal.properties
+share/anjuta/properties/ada.properties
+share/anjuta/properties/anjuta.properties
+share/anjuta/properties/asm.properties
+share/anjuta/properties/asn1.properties
+share/anjuta/properties/au3.properties
+share/anjuta/properties/ave.properties
+share/anjuta/properties/baan.properties
+share/anjuta/properties/bullant.properties
+share/anjuta/properties/conf.properties
+share/anjuta/properties/cpp.properties
+share/anjuta/properties/css.properties
+share/anjuta/properties/eiffel.properties
+share/anjuta/properties/erlang.properties
+share/anjuta/properties/escript.properties
+share/anjuta/properties/forth.properties
+share/anjuta/properties/fortran.properties
+share/anjuta/properties/html.properties
+share/anjuta/properties/kix.properties
+share/anjuta/properties/latex.properties
+share/anjuta/properties/lisp.properties
+share/anjuta/properties/lot.properties
+share/anjuta/properties/lout.properties
+share/anjuta/properties/lua.properties
+share/anjuta/properties/matlab.properties
+share/anjuta/properties/metapost.properties
+share/anjuta/properties/mmixal.properties
+share/anjuta/properties/nncrontab.properties
+share/anjuta/properties/nsis.properties
+share/anjuta/properties/others.properties
+share/anjuta/properties/pascal.properties
+share/anjuta/properties/perl.properties
+share/anjuta/properties/pov.properties
+share/anjuta/properties/ps.properties
+share/anjuta/properties/python.properties
+share/anjuta/properties/ruby.properties
+share/anjuta/properties/scriptol.properties
+share/anjuta/properties/specman.properties
+share/anjuta/properties/sql.properties
+share/anjuta/properties/styles.properties
+share/anjuta/properties/tcl.properties
+share/anjuta/properties/tex.properties
+share/anjuta/properties/user.properties
+share/anjuta/properties/vb.properties
+share/anjuta/properties/verilog.properties
+share/anjuta/properties/vhdl.properties
+share/anjuta/properties/yaml.properties
+share/anjuta/scripts/anjuta-tags
+share/anjuta/scripts/create_global_tags.sh
+share/anjuta/tools/find-fixmes.pl
+share/anjuta/tools/prepare-changelog.pl
+share/anjuta/tools/tools-2.xml
+share/anjuta/tools/translation-status.pl
+share/anjuta/ui/anjuta-build-basic-autotools-plugin.ui
+share/anjuta/ui/anjuta-cvs.ui
+share/anjuta/ui/anjuta-debug-manager.ui
+share/anjuta/ui/anjuta-devhelp-simple.ui
+share/anjuta/ui/anjuta-devhelp.ui
+share/anjuta/ui/anjuta-document-manager.ui
+share/anjuta/ui/anjuta-file-manager.ui
+share/anjuta/ui/anjuta-glade.ui
+share/anjuta/ui/anjuta-gtodo.ui
+share/anjuta/ui/anjuta-language-support-cpp-java.ui
+share/anjuta/ui/anjuta-loader-plugin.ui
+share/anjuta/ui/anjuta-macro.ui
+share/anjuta/ui/anjuta-message-manager.ui
+share/anjuta/ui/anjuta-patch.ui
+share/anjuta/ui/anjuta-project-manager.ui
+share/anjuta/ui/anjuta-sample.ui
+share/anjuta/ui/anjuta-search.ui
+share/anjuta/ui/anjuta-shell.ui
+%%SVN%%share/anjuta/ui/anjuta-subversion.ui
+share/anjuta/ui/anjuta-symbol-browser-plugin.ui
+share/anjuta/ui/anjuta-tools.ui
+share/anjuta/ui/anjuta.ui
+share/anjuta/ui/profiler.ui
+share/anjuta/welcome.txt
+share/applications/anjuta.desktop
 share/gnome/help/anjuta-faqs/C/anjuta-faqs.xml
 share/gnome/help/anjuta-faqs/C/legal.xml
 share/gnome/help/anjuta-manual/C/anjuta-manual.xml
@@ -607,135 +607,135 @@ share/gnome/help/anjuta-manual/C/preferences.xml
 share/gnome/help/anjuta-manual/C/projects.xml
 share/gnome/help/anjuta-manual/C/template.xml
 share/gnome/help/anjuta-manual/C/tools.xml
-share/gnome/omf/anjuta-manual/anjuta-manual-C.omf
-share/gnome/pixmaps/anjuta/Icons.16x16.Class
-share/gnome/pixmaps/anjuta/Icons.16x16.Enum
-share/gnome/pixmaps/anjuta/Icons.16x16.Field
-share/gnome/pixmaps/anjuta/Icons.16x16.FormsDesigner.BringToFront
-share/gnome/pixmaps/anjuta/Icons.16x16.FormsDesigner.SendToBack
-share/gnome/pixmaps/anjuta/Icons.16x16.Interface
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalClass
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalDelegate
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalEnum
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalEvent
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalField
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalInterface
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalMethod
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalProperty
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalStruct
-share/gnome/pixmaps/anjuta/Icons.16x16.Literal
-share/gnome/pixmaps/anjuta/Icons.16x16.Method
-share/gnome/pixmaps/anjuta/Icons.16x16.NameSpace
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateClass
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateDelegate
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateEnum
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateEvent
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateField
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateInterface
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateMethod
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateProperty
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateStruct
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedClass
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedDelegate
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedEnum
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedEvent
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedField
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedInterface
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedMethod
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedProperty
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedStruct
-share/gnome/pixmaps/anjuta/Icons.16x16.Reference
-share/gnome/pixmaps/anjuta/anjuta-build-basic-autotools-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-cvs-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-debug-manager.plugin.png
-share/gnome/pixmaps/anjuta/anjuta-devhelp-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-document-manager.png
-share/gnome/pixmaps/anjuta/anjuta-editor.png
-share/gnome/pixmaps/anjuta/anjuta-file-manager-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-file-wizard-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-gdb.plugin.png
-share/gnome/pixmaps/anjuta/anjuta-glade-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-gtodo-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-language-cpp-java-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-loader-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-macro.png
-share/gnome/pixmaps/anjuta/anjuta-message-view.png
-share/gnome/pixmaps/anjuta/anjuta-patch-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-project-import-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-project-manager-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-project-wizard-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-sample-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-search.png
-%%SVN%%share/gnome/pixmaps/anjuta/anjuta-subversion.png
-share/gnome/pixmaps/anjuta/anjuta-symbol-browser-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-terminal-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-tools-plugin.png
-share/gnome/pixmaps/anjuta/anjuta.png
-share/gnome/pixmaps/anjuta/anjuta_logo.png
-share/gnome/pixmaps/anjuta/anjuta_splash.png
-share/gnome/pixmaps/anjuta/autocomplete-16.png
-share/gnome/pixmaps/anjuta/autocomplete.png
-share/gnome/pixmaps/anjuta/block-end-16.png
-share/gnome/pixmaps/anjuta/block-end.png
-share/gnome/pixmaps/anjuta/block-start-16.png
-share/gnome/pixmaps/anjuta/block-start.png
-share/gnome/pixmaps/anjuta/block_select.xpm
-share/gnome/pixmaps/anjuta/bookmark-clear.png
-share/gnome/pixmaps/anjuta/bookmark-first.png
-share/gnome/pixmaps/anjuta/bookmark-last.png
-share/gnome/pixmaps/anjuta/bookmark-next.png
-share/gnome/pixmaps/anjuta/bookmark-prev.png
-share/gnome/pixmaps/anjuta/bookmark-toggle.png
-share/gnome/pixmaps/anjuta/bookmark.png
-share/gnome/pixmaps/anjuta/breakpoint-disabled.png
-share/gnome/pixmaps/anjuta/breakpoint-enabled.png
-share/gnome/pixmaps/anjuta/breakpoint.png
-share/gnome/pixmaps/anjuta/class-inheritance.png
-share/gnome/pixmaps/anjuta/class_logo.xpm
-share/gnome/pixmaps/anjuta/detach-16.png
-share/gnome/pixmaps/anjuta/detach.png
-share/gnome/pixmaps/anjuta/directory-accept.png
-share/gnome/pixmaps/anjuta/directory.png
-share/gnome/pixmaps/anjuta/error-next-16.png
-share/gnome/pixmaps/anjuta/error-next.png
-share/gnome/pixmaps/anjuta/error-prev-16.png
-share/gnome/pixmaps/anjuta/error-prev.png
-share/gnome/pixmaps/anjuta/fold_close.xpm
-share/gnome/pixmaps/anjuta/fold_open.xpm
-share/gnome/pixmaps/anjuta/fold_toggle.xpm
-share/gnome/pixmaps/anjuta/gtodo-about.png
-share/gnome/pixmaps/anjuta/gtodo-edit.png
-share/gnome/pixmaps/anjuta/gtodo.png
-share/gnome/pixmaps/anjuta/gtodo_tray.png
-share/gnome/pixmaps/anjuta/indent.xpm
-share/gnome/pixmaps/anjuta/indent_auto.xpm
-share/gnome/pixmaps/anjuta/indent_dcr.xpm
-share/gnome/pixmaps/anjuta/indent_inc.xpm
-share/gnome/pixmaps/anjuta/indent_set.xpm
-share/gnome/pixmaps/anjuta/linemarker.png
-share/gnome/pixmaps/anjuta/locals.png
-share/gnome/pixmaps/anjuta/messages.xpm
-share/gnome/pixmaps/anjuta/password.png
-share/gnome/pixmaps/anjuta/pointer.png
-share/gnome/pixmaps/anjuta/preferences-editor.png
-share/gnome/pixmaps/anjuta/preferences-general.png
-share/gnome/pixmaps/anjuta/preferences-messages.png
-share/gnome/pixmaps/anjuta/preferences-terminal.png
-share/gnome/pixmaps/anjuta/profiler.png
-share/gnome/pixmaps/anjuta/program-counter.png
-share/gnome/pixmaps/anjuta/run-to-cursor.png
-share/gnome/pixmaps/anjuta/sourceview.png
-share/gnome/pixmaps/anjuta/stack.png
-share/gnome/pixmaps/anjuta/step-into-16.png
-share/gnome/pixmaps/anjuta/step-into.png
-share/gnome/pixmaps/anjuta/step-out-16.png
-share/gnome/pixmaps/anjuta/step-out.png
-share/gnome/pixmaps/anjuta/step-over-16.png
-share/gnome/pixmaps/anjuta/step-over.png
-share/gnome/pixmaps/anjuta/swap.png
-share/gnome/pixmaps/anjuta/watch.png
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-anjuta.png
 share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-anjuta.svg
+share/omf/anjuta-manual/anjuta-manual-C.omf
+share/pixmaps/anjuta/Icons.16x16.Class
+share/pixmaps/anjuta/Icons.16x16.Enum
+share/pixmaps/anjuta/Icons.16x16.Field
+share/pixmaps/anjuta/Icons.16x16.FormsDesigner.BringToFront
+share/pixmaps/anjuta/Icons.16x16.FormsDesigner.SendToBack
+share/pixmaps/anjuta/Icons.16x16.Interface
+share/pixmaps/anjuta/Icons.16x16.InternalClass
+share/pixmaps/anjuta/Icons.16x16.InternalDelegate
+share/pixmaps/anjuta/Icons.16x16.InternalEnum
+share/pixmaps/anjuta/Icons.16x16.InternalEvent
+share/pixmaps/anjuta/Icons.16x16.InternalField
+share/pixmaps/anjuta/Icons.16x16.InternalInterface
+share/pixmaps/anjuta/Icons.16x16.InternalMethod
+share/pixmaps/anjuta/Icons.16x16.InternalProperty
+share/pixmaps/anjuta/Icons.16x16.InternalStruct
+share/pixmaps/anjuta/Icons.16x16.Literal
+share/pixmaps/anjuta/Icons.16x16.Method
+share/pixmaps/anjuta/Icons.16x16.NameSpace
+share/pixmaps/anjuta/Icons.16x16.PrivateClass
+share/pixmaps/anjuta/Icons.16x16.PrivateDelegate
+share/pixmaps/anjuta/Icons.16x16.PrivateEnum
+share/pixmaps/anjuta/Icons.16x16.PrivateEvent
+share/pixmaps/anjuta/Icons.16x16.PrivateField
+share/pixmaps/anjuta/Icons.16x16.PrivateInterface
+share/pixmaps/anjuta/Icons.16x16.PrivateMethod
+share/pixmaps/anjuta/Icons.16x16.PrivateProperty
+share/pixmaps/anjuta/Icons.16x16.PrivateStruct
+share/pixmaps/anjuta/Icons.16x16.ProtectedClass
+share/pixmaps/anjuta/Icons.16x16.ProtectedDelegate
+share/pixmaps/anjuta/Icons.16x16.ProtectedEnum
+share/pixmaps/anjuta/Icons.16x16.ProtectedEvent
+share/pixmaps/anjuta/Icons.16x16.ProtectedField
+share/pixmaps/anjuta/Icons.16x16.ProtectedInterface
+share/pixmaps/anjuta/Icons.16x16.ProtectedMethod
+share/pixmaps/anjuta/Icons.16x16.ProtectedProperty
+share/pixmaps/anjuta/Icons.16x16.ProtectedStruct
+share/pixmaps/anjuta/Icons.16x16.Reference
+share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin.png
+share/pixmaps/anjuta/anjuta-cvs-plugin.png
+share/pixmaps/anjuta/anjuta-debug-manager.plugin.png
+share/pixmaps/anjuta/anjuta-devhelp-plugin.png
+share/pixmaps/anjuta/anjuta-document-manager.png
+share/pixmaps/anjuta/anjuta-editor.png
+share/pixmaps/anjuta/anjuta-file-manager-plugin.png
+share/pixmaps/anjuta/anjuta-file-wizard-plugin.png
+share/pixmaps/anjuta/anjuta-gdb.plugin.png
+share/pixmaps/anjuta/anjuta-glade-plugin.png
+share/pixmaps/anjuta/anjuta-gtodo-plugin.png
+share/pixmaps/anjuta/anjuta-language-cpp-java-plugin.png
+share/pixmaps/anjuta/anjuta-loader-plugin.png
+share/pixmaps/anjuta/anjuta-macro.png
+share/pixmaps/anjuta/anjuta-message-view.png
+share/pixmaps/anjuta/anjuta-patch-plugin.png
+share/pixmaps/anjuta/anjuta-project-import-plugin.png
+share/pixmaps/anjuta/anjuta-project-manager-plugin.png
+share/pixmaps/anjuta/anjuta-project-wizard-plugin.png
+share/pixmaps/anjuta/anjuta-sample-plugin.png
+share/pixmaps/anjuta/anjuta-search.png
+%%SVN%%share/pixmaps/anjuta/anjuta-subversion.png
+share/pixmaps/anjuta/anjuta-symbol-browser-plugin.png
+share/pixmaps/anjuta/anjuta-terminal-plugin.png
+share/pixmaps/anjuta/anjuta-tools-plugin.png
+share/pixmaps/anjuta/anjuta.png
+share/pixmaps/anjuta/anjuta_logo.png
+share/pixmaps/anjuta/anjuta_splash.png
+share/pixmaps/anjuta/autocomplete-16.png
+share/pixmaps/anjuta/autocomplete.png
+share/pixmaps/anjuta/block-end-16.png
+share/pixmaps/anjuta/block-end.png
+share/pixmaps/anjuta/block-start-16.png
+share/pixmaps/anjuta/block-start.png
+share/pixmaps/anjuta/block_select.xpm
+share/pixmaps/anjuta/bookmark-clear.png
+share/pixmaps/anjuta/bookmark-first.png
+share/pixmaps/anjuta/bookmark-last.png
+share/pixmaps/anjuta/bookmark-next.png
+share/pixmaps/anjuta/bookmark-prev.png
+share/pixmaps/anjuta/bookmark-toggle.png
+share/pixmaps/anjuta/bookmark.png
+share/pixmaps/anjuta/breakpoint-disabled.png
+share/pixmaps/anjuta/breakpoint-enabled.png
+share/pixmaps/anjuta/breakpoint.png
+share/pixmaps/anjuta/class-inheritance.png
+share/pixmaps/anjuta/class_logo.xpm
+share/pixmaps/anjuta/detach-16.png
+share/pixmaps/anjuta/detach.png
+share/pixmaps/anjuta/directory-accept.png
+share/pixmaps/anjuta/directory.png
+share/pixmaps/anjuta/error-next-16.png
+share/pixmaps/anjuta/error-next.png
+share/pixmaps/anjuta/error-prev-16.png
+share/pixmaps/anjuta/error-prev.png
+share/pixmaps/anjuta/fold_close.xpm
+share/pixmaps/anjuta/fold_open.xpm
+share/pixmaps/anjuta/fold_toggle.xpm
+share/pixmaps/anjuta/gtodo-about.png
+share/pixmaps/anjuta/gtodo-edit.png
+share/pixmaps/anjuta/gtodo.png
+share/pixmaps/anjuta/gtodo_tray.png
+share/pixmaps/anjuta/indent.xpm
+share/pixmaps/anjuta/indent_auto.xpm
+share/pixmaps/anjuta/indent_dcr.xpm
+share/pixmaps/anjuta/indent_inc.xpm
+share/pixmaps/anjuta/indent_set.xpm
+share/pixmaps/anjuta/linemarker.png
+share/pixmaps/anjuta/locals.png
+share/pixmaps/anjuta/messages.xpm
+share/pixmaps/anjuta/password.png
+share/pixmaps/anjuta/pointer.png
+share/pixmaps/anjuta/preferences-editor.png
+share/pixmaps/anjuta/preferences-general.png
+share/pixmaps/anjuta/preferences-messages.png
+share/pixmaps/anjuta/preferences-terminal.png
+share/pixmaps/anjuta/profiler.png
+share/pixmaps/anjuta/program-counter.png
+share/pixmaps/anjuta/run-to-cursor.png
+share/pixmaps/anjuta/sourceview.png
+share/pixmaps/anjuta/stack.png
+share/pixmaps/anjuta/step-into-16.png
+share/pixmaps/anjuta/step-into.png
+share/pixmaps/anjuta/step-out-16.png
+share/pixmaps/anjuta/step-out.png
+share/pixmaps/anjuta/step-over-16.png
+share/pixmaps/anjuta/step-over.png
+share/pixmaps/anjuta/swap.png
+share/pixmaps/anjuta/watch.png
 share/icons/hicolor/48x48/apps/anjuta.png
 share/icons/hicolor/scalable/apps/anjuta.svg
 share/locale/ar/LC_MESSAGES/anjuta.mo
@@ -785,73 +785,67 @@ share/locale/zh_CN/LC_MESSAGES/anjuta.mo
 share/locale/zh_TW/LC_MESSAGES/anjuta.mo
 share/mime/application/x-anjuta.xml
 share/mime/packages/anjuta.xml
-@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/pixmaps/anjuta
-@dirrm share/gnome/omf/anjuta-manual
+@dirrm share/pixmaps/anjuta
+@dirrm share/omf/anjuta-manual
 @dirrm share/gnome/help/anjuta-manual/C/figures
 @dirrm share/gnome/help/anjuta-manual/C
 @dirrm share/gnome/help/anjuta-manual
 @dirrm share/gnome/help/anjuta-faqs/C
 @dirrm share/gnome/help/anjuta-faqs
-@dirrm share/gnome/anjuta/ui
-@dirrm share/gnome/anjuta/tools
-@dirrm share/gnome/anjuta/scripts
-@dirrm share/gnome/anjuta/properties
-@dirrm share/gnome/anjuta/project/xlib/src
-@dirrm share/gnome/anjuta/project/xlib/po
-@dirrm share/gnome/anjuta/project/xlib-dock/src
-@dirrm share/gnome/anjuta/project/xlib-dock/po
-@dirrm share/gnome/anjuta/project/xlib-dock
-@dirrm share/gnome/anjuta/project/xlib
-@dirrm share/gnome/anjuta/project/wxwin/src
-@dirrm share/gnome/anjuta/project/wxwin/po
-@dirrm share/gnome/anjuta/project/wxwin
-@dirrm share/gnome/anjuta/project/terminal/src
-@dirrm share/gnome/anjuta/project/terminal/po
-@dirrm share/gnome/anjuta/project/terminal
-@dirrm share/gnome/anjuta/project/sdl/src
-@dirrm share/gnome/anjuta/project/sdl/po
-@dirrm share/gnome/anjuta/project/sdl
-@dirrm share/gnome/anjuta/project/python/src
-@dirrm share/gnome/anjuta/project/python/po
-@dirrm share/gnome/anjuta/project/python
-@dirrm share/gnome/anjuta/project/mkfile/src
-@dirrm share/gnome/anjuta/project/mkfile/po
-@dirrm share/gnome/anjuta/project/mkfile
-@dirrm share/gnome/anjuta/project/minimal
-@dirrm share/gnome/anjuta/project/java/src
-@dirrm share/gnome/anjuta/project/java/po
-@dirrm share/gnome/anjuta/project/java
-@dirrm share/gnome/anjuta/project/gtkmm/src
-@dirrm share/gnome/anjuta/project/gtkmm/po
-@dirrm share/gnome/anjuta/project/gtkmm
-@dirrm share/gnome/anjuta/project/gtk/src
-@dirrm share/gnome/anjuta/project/gtk/po
-@dirrm share/gnome/anjuta/project/gtk
-@dirrm share/gnome/anjuta/project/gnome/src
-@dirrm share/gnome/anjuta/project/gnome/po
-@dirrm share/gnome/anjuta/project/gnome
-@dirrm share/gnome/anjuta/project/gcj/src
-@dirrm share/gnome/anjuta/project/gcj
-@dirrm share/gnome/anjuta/project/cpp/src
-@dirrm share/gnome/anjuta/project/cpp/po
-@dirrm share/gnome/anjuta/project/cpp
-@dirrm share/gnome/anjuta/project/anjuta-plugin/src
-@dirrm share/gnome/anjuta/project/anjuta-plugin/po
-@dirrm share/gnome/anjuta/project/anjuta-plugin
-@dirrm share/gnome/anjuta/project
-@dirrm share/gnome/anjuta/profiles
-@dirrm share/gnome/anjuta/gtodo
-@dirrm share/gnome/anjuta/glade
-@dirrm share/gnome/anjuta/class-templates
-@dirrm share/gnome/anjuta/build
-@dirrm share/gnome/anjuta
 @dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrm share/anjuta/ui
+@dirrm share/anjuta/tools
+@dirrm share/anjuta/scripts
+@dirrm share/anjuta/properties
+@dirrm share/anjuta/project/xlib/src
+@dirrm share/anjuta/project/xlib/po
+@dirrm share/anjuta/project/xlib-dock/src
+@dirrm share/anjuta/project/xlib-dock/po
+@dirrm share/anjuta/project/xlib-dock
+@dirrm share/anjuta/project/xlib
+@dirrm share/anjuta/project/wxwin/src
+@dirrm share/anjuta/project/wxwin/po
+@dirrm share/anjuta/project/wxwin
+@dirrm share/anjuta/project/terminal/src
+@dirrm share/anjuta/project/terminal/po
+@dirrm share/anjuta/project/terminal
+@dirrm share/anjuta/project/sdl/src
+@dirrm share/anjuta/project/sdl/po
+@dirrm share/anjuta/project/sdl
+@dirrm share/anjuta/project/python/src
+@dirrm share/anjuta/project/python/po
+@dirrm share/anjuta/project/python
+@dirrm share/anjuta/project/mkfile/src
+@dirrm share/anjuta/project/mkfile/po
+@dirrm share/anjuta/project/mkfile
+@dirrm share/anjuta/project/minimal
+@dirrm share/anjuta/project/java/src
+@dirrm share/anjuta/project/java/po
+@dirrm share/anjuta/project/java
+@dirrm share/anjuta/project/gtkmm/src
+@dirrm share/anjuta/project/gtkmm/po
+@dirrm share/anjuta/project/gtkmm
+@dirrm share/anjuta/project/gtk/src
+@dirrm share/anjuta/project/gtk/po
+@dirrm share/anjuta/project/gtk
+@dirrm share/anjuta/project/gnome/src
+@dirrm share/anjuta/project/gnome/po
+@dirrm share/anjuta/project/gnome
+@dirrm share/anjuta/project/gcj/src
+@dirrm share/anjuta/project/gcj
+@dirrm share/anjuta/project/cpp/src
+@dirrm share/anjuta/project/cpp/po
+@dirrm share/anjuta/project/cpp
+@dirrm share/anjuta/project/anjuta-plugin/src
+@dirrm share/anjuta/project/anjuta-plugin/po
+@dirrm share/anjuta/project/anjuta-plugin
+@dirrm share/anjuta/project
+@dirrm share/anjuta/profiles
+@dirrm share/anjuta/gtodo
+@dirrm share/anjuta/glade
+@dirrm share/anjuta/class-templates
+@dirrm share/anjuta/build
+@dirrm share/anjuta
 @dirrm share/doc/libanjuta
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/anjuta
@@ -860,3 +854,10 @@ share/mime/packages/anjuta.xml
 @dirrm include/libanjuta-1.0
 @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/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 90eefe556a82..4010b09452dd 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bonobo-conf
 PORTVERSION=	0.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/bonobo-conf/0.16
diff --git a/devel/bonobo-conf/pkg-plist b/devel/bonobo-conf/pkg-plist
index 188a78836ec1..3090dfb6fd22 100644
--- a/devel/bonobo-conf/pkg-plist
+++ b/devel/bonobo-conf/pkg-plist
@@ -20,10 +20,10 @@ lib/libbonobo_conf.a
 lib/libbonobo_conf.la
 lib/libbonobo_conf.so
 lib/libbonobo_conf.so.0
-share/gnome/idl/Bonobo_Config.idl
-share/gnome/oaf/Bonobo_Moniker_config.oaf
-share/gnome/oaf/Bonobo_Moniker_gconf.oaf
-share/gnome/oaf/Bonobo_Moniker_xmldb.oaf
+share/idl/Bonobo_Config.idl
+share/oaf/Bonobo_Moniker_config.oaf
+share/oaf/Bonobo_Moniker_gconf.oaf
+share/oaf/Bonobo_Moniker_xmldb.oaf
 share/locale/az/LC_MESSAGES/bonobo-conf.mo
 share/locale/da/LC_MESSAGES/bonobo-conf.mo
 share/locale/de/LC_MESSAGES/bonobo-conf.mo
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 3a8773eca71e..729484e67c87 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/bonobo/Makefile,v 1.2 2006/09/10 00:51:07 mezz Exp $
+#   $MCom: ports/devel/bonobo/Makefile,v 1.5 2007/05/19 21:36:04 marcus Exp $
 #
 
 PORTNAME=	bonobo
 PORTVERSION=	1.0.22
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
diff --git a/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in b/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
index 5fc3fc20b13a..36eac4b5a92a 100644
--- a/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
+++ b/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
@@ -7,8 +7,8 @@ $FreeBSD$
  cxxflags_set = @cxxflags_set@
  l = @l@
  
--audio_ulaw_helpdir = $(datadir)/bonobo/docs/audio_ulaw/C
-+audio_ulaw_helpdir = $(datadir)/help/audio_ulaw/C
+-audio_ulaw_helpdir = $(datadir)/gnome/bonobo/docs/audio_ulaw/C
++audio_ulaw_helpdir = $(datadir)/gnome/help/bonobo/audio_ulaw/C
  
  # 
  # Module configuration information
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 4cc3ae908a2e..927719f611b7 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -177,41 +177,29 @@ libdata/pkgconfig/libefs.pc
 %%DOCSDIR%%/bonobo/bonobo-ui.html
 %%DOCSDIR%%/bonobo/bonobo-view.html
 %%DOCSDIR%%/bonobo/book1.html
-share/gnome/help/audio_ulaw/C/index.html
-share/gnome/idl/Bonobo.idl
-share/gnome/idl/Bonobo_Advise.idl
-share/gnome/idl/Bonobo_Canvas.idl
-share/gnome/idl/Bonobo_ClientSite.idl
-share/gnome/idl/Bonobo_Context.idl
-share/gnome/idl/Bonobo_Control.idl
-share/gnome/idl/Bonobo_Desktop.idl
-share/gnome/idl/Bonobo_Embeddable.idl
-share/gnome/idl/Bonobo_Exception.idl
-share/gnome/idl/Bonobo_ItemContainer.idl
-share/gnome/idl/Bonobo_Listener.idl
-share/gnome/idl/Bonobo_Moniker.idl
-share/gnome/idl/Bonobo_Persist.idl
-share/gnome/idl/Bonobo_Print.idl
-share/gnome/idl/Bonobo_Progressive.idl
-share/gnome/idl/Bonobo_Property.idl
-share/gnome/idl/Bonobo_Sample_Echo.idl
-share/gnome/idl/Bonobo_Storage.idl
-share/gnome/idl/Bonobo_UI.idl
-share/gnome/idl/Bonobo_Unknown.idl
-share/gnome/idl/Bonobo_Zoomable.idl
-share/gnome/oaf/Bonobo_Moniker_gzip.oaf
-share/gnome/oaf/Bonobo_Moniker_http.oaf
-share/gnome/oaf/Bonobo_Moniker_std.oaf
-share/gnome/oaf/Bonobo_Sample_Audio.oaf
-share/gnome/oaf/Bonobo_Sample_CanvasItem.oaf
-share/gnome/oaf/Bonobo_Sample_Controls.oaf
-share/gnome/oaf/Bonobo_Sample_Echo.oaf
-share/gnome/oaf/Bonobo_Sample_Hello.oafinfo
-share/gnome/oaf/Bonobo_Sample_Mines.oaf
-share/gnome/oaf/Bonobo_Sample_Paint.oaf
-share/gnome/oaf/Bonobo_Sample_Text.oaf
-share/gnome/oaf/Bonobo_Selector.oaf
+share/gnome/help/bonobo/audio_ulaw/C/index.html
 share/gnome/ui/gshell-ui.xml
+share/idl/Bonobo.idl
+share/idl/Bonobo_Advise.idl
+share/idl/Bonobo_Canvas.idl
+share/idl/Bonobo_ClientSite.idl
+share/idl/Bonobo_Context.idl
+share/idl/Bonobo_Control.idl
+share/idl/Bonobo_Desktop.idl
+share/idl/Bonobo_Embeddable.idl
+share/idl/Bonobo_Exception.idl
+share/idl/Bonobo_ItemContainer.idl
+share/idl/Bonobo_Listener.idl
+share/idl/Bonobo_Moniker.idl
+share/idl/Bonobo_Persist.idl
+share/idl/Bonobo_Print.idl
+share/idl/Bonobo_Progressive.idl
+share/idl/Bonobo_Property.idl
+share/idl/Bonobo_Sample_Echo.idl
+share/idl/Bonobo_Storage.idl
+share/idl/Bonobo_UI.idl
+share/idl/Bonobo_Unknown.idl
+share/idl/Bonobo_Zoomable.idl
 share/locale/az/LC_MESSAGES/bonobo.mo
 share/locale/ca/LC_MESSAGES/bonobo.mo
 share/locale/da/LC_MESSAGES/bonobo.mo
@@ -244,9 +232,22 @@ share/locale/uk/LC_MESSAGES/bonobo.mo
 share/locale/wa/LC_MESSAGES/bonobo.mo
 share/locale/zh_CN/LC_MESSAGES/bonobo.mo
 share/locale/zh_TW/LC_MESSAGES/bonobo.mo
-@dirrm share/gnome/help/audio_ulaw/C/images
-@dirrm share/gnome/help/audio_ulaw/C
-@dirrm share/gnome/help/audio_ulaw
+share/oaf/Bonobo_Moniker_gzip.oaf
+share/oaf/Bonobo_Moniker_http.oaf
+share/oaf/Bonobo_Moniker_std.oaf
+share/oaf/Bonobo_Sample_Audio.oaf
+share/oaf/Bonobo_Sample_CanvasItem.oaf
+share/oaf/Bonobo_Sample_Controls.oaf
+share/oaf/Bonobo_Sample_Echo.oaf
+share/oaf/Bonobo_Sample_Hello.oafinfo
+share/oaf/Bonobo_Sample_Mines.oaf
+share/oaf/Bonobo_Sample_Paint.oaf
+share/oaf/Bonobo_Sample_Text.oaf
+share/oaf/Bonobo_Selector.oaf
+@dirrm share/gnome/help/bonobo/audio_ulaw/C/images
+@dirrm share/gnome/help/bonobo/audio_ulaw/C
+@dirrm share/gnome/help/bonobo/audio_ulaw
+@dirrm share/gnome/help/bonobo
 @dirrm %%DOCSDIR%%/libefs
 @dirrm %%DOCSDIR%%/bonobo
 @dirrm %%DOCSDIR%%
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 68dc5552dea5..b65ae3b36103 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/bug-buddy/Makefile,v 1.44 2007/03/13 12:27:23 ahze Exp $
+#   $MCom: ports/devel/bug-buddy/Makefile,v 1.55 2007/10/06 22:03:31 mezz Exp $
 #
 
 PORTNAME=	bug-buddy
-PORTVERSION=	2.18.1
-PORTREVISION=	2
+PORTVERSION=	2.20.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -37,5 +36,8 @@ GCONF_SCHEMAS=	bug-buddy.schemas
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
 		${WRKSRC}/src/bugzilla.c
+	@${REINPLACE_CMD} -e 's|libelf.h||g ; \
+	    	s|gelf.h||g' \
+	    	${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index fbfff725646f..b443c5b57814 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.18.1.tar.bz2) = ebeaeee4acc1432b59a4ef242abff620
-SHA256 (gnome2/bug-buddy-2.18.1.tar.bz2) = 99cbdbe16942291f6a02060bf7b0bb7e5a36096379a02e513ad669eec0fdd311
-SIZE (gnome2/bug-buddy-2.18.1.tar.bz2) = 553967
+MD5 (gnome2/bug-buddy-2.20.1.tar.bz2) = 6b9ea4c067674120bd93711b3b9a9e63
+SHA256 (gnome2/bug-buddy-2.20.1.tar.bz2) = cb0cb3f2400f201e2bf7afc6de81df6ab4b68c5a770ec0a132c300efe72d5f4e
+SIZE (gnome2/bug-buddy-2.20.1.tar.bz2) = 1070862
diff --git a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
new file mode 100644
index 000000000000..801be10640bf
--- /dev/null
+++ b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
@@ -0,0 +1,52 @@
+--- gnome-breakpad/gnome-breakpad.cc.orig	2007-08-16 13:55:38.000000000 -0400
++++ gnome-breakpad/gnome-breakpad.cc	2007-09-02 19:21:10.000000000 -0400
+@@ -6,8 +6,14 @@
+ #include <cassert>
+ #include <cstring>
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ #include <libelf.h>
+ #include <gelf.h>
++#endif
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -114,6 +120,7 @@ find_in_debug_path (const char *filename
+ }
+ 	
+ 
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ static gboolean
+ elf_has_debug_symbols (const char *filename)
+ {
+@@ -166,7 +173,7 @@ elf_has_debug_symbols (const char *filen
+        elf_end (elf);
+        return false;
+ }
+-
++#endif
+ 
+ 
+ 
+@@ -269,9 +276,17 @@ check_if_gdb (void *callback_context)
+ 		_exit(0);
+ 	}
+ 	
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ 	memset(mypath, 0, sizeof(mypath));
++#ifndef __FreeBSD__
+ 	readlink ("/proc/self/exe", mypath, sizeof(mypath));
++#else
++	readlink ("/proc/curproc/file", mypath, sizeof(mypath));
++#endif
+ 	has_debug_symbols = elf_has_debug_symbols (mypath);
++#else
++	has_debug_symbols = TRUE;
++#endif
+ 
+ 
+ 	if (bugbuddy && gdb && has_debug_symbols) {
diff --git a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
deleted file mode 100644
index 0866ee39f8fc..000000000000
--- a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bug-buddy.menu.in.orig	Tue Feb 27 13:46:40 2007
-+++ src/bug-buddy.menu.in	Tue Feb 27 13:46:54 2007
-@@ -6,7 +6,7 @@
-   <Name>Bug Buddy programs</Name>
- 
-   <!-- Read only files in default .desktop file location -->
--  <LegacyDir>@prefix@/@DATADIRNAME@/applications</LegacyDir>
-+  <LegacyDir>@prefix@/@DATADIRNAME@/gnome/applications</LegacyDir>
-   <LegacyDir>@prefix@/@DATADIRNAME@/gnome/autostart</LegacyDir>
- 
-   <!-- we want to process all desktop files; Unfortunately,
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 4ac6b5cd86c8..27f3b5fad558 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -1,22 +1,26 @@
 bin/bug-buddy
-share/gnome/applications/bug-buddy.desktop
-share/gnome/bug-buddy/bug-buddy.glade
-share/gnome/bug-buddy/bug-buddy.menu
-share/gnome/bug-buddy/bug-buddy.png
-share/gnome/bug-buddy/bugzilla/gnome.bugzilla
-share/gnome/bug-buddy/bugzilla/gnome/config
-share/gnome/bug-buddy/bugzilla/gnome/mostfreq
-share/gnome/bug-buddy/bugzilla/gnome/products
-share/gnome/bug-buddy/bugzilla/ximian.bugzilla
-share/gnome/bug-buddy/bugzilla/ximian/config
-share/gnome/bug-buddy/bugzilla/ximian/mostfreq
-share/gnome/bug-buddy/bugzilla/ximian/products
-share/gnome/bug-buddy/gdb-cmd
+lib/gtk-2.0/modules/libgnomebreakpad.la
+lib/gtk-2.0/modules/libgnomebreakpad.so
+share/applications/bug-buddy.desktop
+%%DATADIR%%/bug-buddy.gtkbuilder
+%%DATADIR%%/bug-buddy.menu
+%%DATADIR%%/bug-buddy.png
+%%DATADIR%%/bugzilla/gnome.bugzilla
+%%DATADIR%%/bugzilla/gnome/config
+%%DATADIR%%/bugzilla/gnome/mostfreq
+%%DATADIR%%/bugzilla/gnome/products
+%%DATADIR%%/bugzilla/ximian.bugzilla
+%%DATADIR%%/bugzilla/ximian/config
+%%DATADIR%%/bugzilla/ximian/mostfreq
+%%DATADIR%%/bugzilla/ximian/products
+%%DATADIR%%/gdb-cmd
 share/icons/hicolor/48x48/apps/bug-buddy.png
 share/locale/am/LC_MESSAGES/bug-buddy.mo
 share/locale/ar/LC_MESSAGES/bug-buddy.mo
+share/locale/as/LC_MESSAGES/bug-buddy.mo
 share/locale/az/LC_MESSAGES/bug-buddy.mo
 share/locale/be/LC_MESSAGES/bug-buddy.mo
+share/locale/be@latin/LC_MESSAGES/bug-buddy.mo
 share/locale/bg/LC_MESSAGES/bug-buddy.mo
 share/locale/bn/LC_MESSAGES/bug-buddy.mo
 share/locale/bn_IN/LC_MESSAGES/bug-buddy.mo
@@ -63,6 +67,7 @@ share/locale/nb/LC_MESSAGES/bug-buddy.mo
 share/locale/ne/LC_MESSAGES/bug-buddy.mo
 share/locale/nl/LC_MESSAGES/bug-buddy.mo
 share/locale/nn/LC_MESSAGES/bug-buddy.mo
+share/locale/oc/LC_MESSAGES/bug-buddy.mo
 share/locale/or/LC_MESSAGES/bug-buddy.mo
 share/locale/pa/LC_MESSAGES/bug-buddy.mo
 share/locale/pl/LC_MESSAGES/bug-buddy.mo
@@ -71,6 +76,7 @@ share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo
 share/locale/ro/LC_MESSAGES/bug-buddy.mo
 share/locale/ru/LC_MESSAGES/bug-buddy.mo
 share/locale/rw/LC_MESSAGES/bug-buddy.mo
+share/locale/si/LC_MESSAGES/bug-buddy.mo
 share/locale/sk/LC_MESSAGES/bug-buddy.mo
 share/locale/sl/LC_MESSAGES/bug-buddy.mo
 share/locale/sq/LC_MESSAGES/bug-buddy.mo
@@ -78,28 +84,38 @@ share/locale/sr/LC_MESSAGES/bug-buddy.mo
 share/locale/sr@Latn/LC_MESSAGES/bug-buddy.mo
 share/locale/sv/LC_MESSAGES/bug-buddy.mo
 share/locale/ta/LC_MESSAGES/bug-buddy.mo
+share/locale/te/LC_MESSAGES/bug-buddy.mo
 share/locale/th/LC_MESSAGES/bug-buddy.mo
 share/locale/tr/LC_MESSAGES/bug-buddy.mo
 share/locale/ug/LC_MESSAGES/bug-buddy.mo
 share/locale/uk/LC_MESSAGES/bug-buddy.mo
+share/locale/uz@cyrillic/LC_MESSAGES/bug-buddy.mo
 share/locale/vi/LC_MESSAGES/bug-buddy.mo
 share/locale/wa/LC_MESSAGES/bug-buddy.mo
 share/locale/xh/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
-@dirrm share/gnome/bug-buddy/bugzilla/ximian
-@dirrm share/gnome/bug-buddy/bugzilla/gnome
-@dirrm share/gnome/bug-buddy/bugzilla
-@dirrm share/gnome/bug-buddy
+@dirrm %%DATADIR%%/bugzilla/ximian
+@dirrm %%DATADIR%%/bugzilla/gnome
+@dirrm %%DATADIR%%/bugzilla
+@dirrm %%DATADIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -112,3 +128,8 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.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
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/applications
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index 1c3002de896b..8cb9e123aa06 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -3,38 +3,32 @@
 # Whom:				Jean-Yves Lefort <jylefort@brutele.be>
 #
 # $FreeBSD$
+#   $MCom: ports/devel/desktop-file-utils/Makefile,v 1.8 2007/09/07 20:22:45 mezz Exp $
 #
 
-PORTNAME=		desktop-file-utils
-PORTVERSION=		0.12
-PORTREVISION=		1
-CATEGORIES=		devel
-MASTER_SITES=		http://freedesktop.org/software/${PORTNAME}/releases/
+PORTNAME=	desktop-file-utils
+PORTVERSION=	0.14
+CATEGORIES=	devel
+MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/releases/
 
-MAINTAINER=		gnome@FreeBSD.org
-COMMENT=		A couple of command line utilities for working with desktop entries
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A couple of command line utilities for working with desktop entries
 
-LIB_DEPENDS=		popt:${PORTSDIR}/devel/popt
-
-USE_GNOME=		glib20
-WANT_GNOME=		yes
+USE_GNOME=	glib20
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=		--without-lispdir
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" EMACS="no"
+CONFIGURE_ARGS=	--without-lispdir
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" EMACS="no"
 
-PKGINSTALL=		${WRKDIR}/pkg-install
-PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
-PORT_MIMEDIRS=		${LOCALBASE}/share/applications \
-			${LOCALBASE}/share/gnome/applications
+PORT_MIMEDIRS=	${LOCALBASE}/share/applications
 
-MIMEDIRS=		${PORT_MIMEDIRS} \
-			/usr/share/applications \
-			/usr/share/gnome/applications
+MIMEDIRS=	${PORT_MIMEDIRS}
 
-RMDIRS=			${PORT_MIMEDIRS} \
-			${LOCALBASE}/share/gnome
+RMDIRS=		${PORT_MIMEDIRS}
 
 post-patch:
 	@${SED} -e 's|%%MIMEDIRS%%|${MIMEDIRS}| ;\
diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo
index 9646bf3c9489..d7cdd1430760 100644
--- a/devel/desktop-file-utils/distinfo
+++ b/devel/desktop-file-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (desktop-file-utils-0.12.tar.gz) = 335b91ec70ea1c08f87dfde8c5926e7b
-SHA256 (desktop-file-utils-0.12.tar.gz) = 7db6ade355d56913cecd098a5bec1037bca42e7c7e4b7257c7f7f9f655c5e606
-SIZE (desktop-file-utils-0.12.tar.gz) = 348418
+MD5 (desktop-file-utils-0.14.tar.gz) = e0b5057a4e3166f34635ac6f27c712c0
+SHA256 (desktop-file-utils-0.14.tar.gz) = 97856d2621d4e3273340b7f1172c2e074c74263629b05bde0f0f077425ec0699
+SIZE (desktop-file-utils-0.14.tar.gz) = 348743
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index f5fd82ddec2f..7e5956a8c929 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	devhelp
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,}
diff --git a/devel/devhelp/files/patch-src_dh-base.c b/devel/devhelp/files/patch-src_dh-base.c
index dc989e10989c..ffa3c3b54602 100644
--- a/devel/devhelp/files/patch-src_dh-base.c
+++ b/devel/devhelp/files/patch-src_dh-base.c
@@ -5,7 +5,7 @@
  	base_add_books (base, dir);
  	g_free (dir);
 +
-+	dir = g_build_filename (data_dir, "..", "doc", NULL);
++	dir = g_build_filename (data_dir, "doc", NULL);
 +	base_add_books (base, dir);
 +	g_free (dir);
  }
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 69b3be5556f8..4269311daff3 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -23,14 +23,14 @@ lib/libdevhelp-1.la
 lib/libdevhelp-1.so
 lib/libdevhelp-1.so.0
 libdata/pkgconfig/libdevhelp-1.0.pc
-share/gnome/applications/devhelp.desktop
-share/gnome/devhelp/default-prefs.js
-share/gnome/devhelp/devhelp.glade
-share/gnome/devhelp/dtd/devhelp-1.dtd
-share/gnome/devhelp/images/book_closed.png
-share/gnome/devhelp/images/book_open.png
-share/gnome/devhelp/images/helpdoc.png
-share/gnome/devhelp/ui/window.ui
+share/applications/devhelp.desktop
+share/devhelp/default-prefs.js
+share/devhelp/devhelp.glade
+share/devhelp/dtd/devhelp-1.dtd
+share/devhelp/images/book_closed.png
+share/devhelp/images/book_open.png
+share/devhelp/images/helpdoc.png
+share/devhelp/ui/window.ui
 share/icons/hicolor/48x48/apps/devhelp.png
 share/icons/hicolor/scalable/apps/devhelp.svg
 share/locale/am/LC_MESSAGES/devhelp.mo
@@ -93,10 +93,10 @@ share/locale/vi/LC_MESSAGES/devhelp.mo
 share/locale/zh_CN/LC_MESSAGES/devhelp.mo
 share/locale/zh_HK/LC_MESSAGES/devhelp.mo
 share/locale/zh_TW/LC_MESSAGES/devhelp.mo
-@dirrm share/gnome/devhelp/ui
-@dirrm share/gnome/devhelp/images
-@dirrm share/gnome/devhelp/dtd
-@dirrm share/gnome/devhelp
+@dirrm share/devhelp/ui
+@dirrm share/devhelp/images
+@dirrm share/devhelp/dtd
+@dirrm share/devhelp
 @dirrm include/devhelp-1.0/devhelp
 @dirrm include/devhelp-1.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -113,3 +113,4 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 4a7cbdb0f06a..e622d240b51a 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -3,13 +3,15 @@
 # Whom:					Frerich Raabe <frerich.raabe@gmx.de>
 #
 # $FreeBSD$
+#   $MCom: ports/devel/distcc/Makefile,v 1.3 2007/10/21 02:46:13 ahze Exp $
 #
 
 PORTNAME=	distcc
 PORTVERSION=	2.18.3
-PORTREVISION=	5
-CATEGORIES=	devel ipv6
+PORTREVISION=	7
+CATEGORIES=	devel
 MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
+PATCH_SITES=	http://0pointer.de/public/
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Distribute compilation of C(++) code acrosss machines on a network
@@ -20,19 +22,28 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	 --enable-rfc2553
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 DISTCCD_PIDFILE=/var/run/distccd.pid
 USE_RC_SUBR=	distccd.sh
 SUB_LIST=	DISTCCD_PIDFILE=${DISTCCD_PIDFILE}
 
-OPTIONS=	GNOME	"Build GUI monitor based on GNOME"	Off \
+OPTIONS=	AVAHI   "Enable Avahi Zeroconf/mDNS/Bonjour support" Off \
+		GNOME	"Build GUI monitor based on GNOME"	Off \
 		GTK	"Build GUI monitor based on GTK"	Off \
-		IPV6	"Enable IPV6"				Off \
-		COMPILER_LINKS	"Create symlinks to distcc"	Off
+		COMPILER_LINKS	"Create symlinks to distcc"	On
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_AVAHI)
+PATCHFILES+=	distcc-avahi.patch
+LIB_DEPENDS+=	avahi-glib.1:${PORTSDIR}/net/avahi
+PATCH_DIST_STRIP=	-p1
+USE_AUTOTOOLS+=	autoconf:261
+CFLAGS+=	-DHAVE_AVAHI
+.endif
+
 .if defined(WITH_COMPILER_LINKS)
 CCLINKDIR?=		libexec/distcc
 PLIST_DIRS=		${CCLINKDIR}
@@ -61,10 +72,6 @@ PLIST_SUB+=		WITH_GNOME=""
 PLIST_SUB+=		WITH_GNOME="@comment "
 .endif
 
-.if defined(WITH_IPV6)
-CONFIGURE_ARGS+=	--enable-rfc2553
-.endif
-
 MAN1=		distcc.1 distccd.1
 DOC_FILES=	AUTHORS INSTALL NEWS README \
 		doc/protocol-1.txt doc/status-1.txt \
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index e20d0e56e131..1d8af34f329c 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1,3 +1,6 @@
 MD5 (distcc-2.18.3.tar.bz2) = 0d6b80a1efc3a3d816c4f4175f63eaa2
 SHA256 (distcc-2.18.3.tar.bz2) = 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434
 SIZE (distcc-2.18.3.tar.bz2) = 341601
+MD5 (distcc-avahi.patch) = 621dc7dc1e3b9b6770110117df45611a
+SHA256 (distcc-avahi.patch) = e6651e3de7fee6d953b6ee56732eafa7d4666cb4070db5a925ba071626067c9a
+SIZE (distcc-avahi.patch) = 54086
diff --git a/devel/distcc/files/distccd.sh.in b/devel/distcc/files/distccd.sh.in
index d5a9efb91add..0942b3014f7a 100644
--- a/devel/distcc/files/distccd.sh.in
+++ b/devel/distcc/files/distccd.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#
+#    $MCom: ports/devel/distcc/files/distccd.sh.in,v 1.1 2007/05/19 17:43:14 ahze Exp $
 
 # PROVIDE: distccd
 # REQUIRE: NETWORKING
diff --git a/devel/doxygen/files/patch-fix_with_libiconv-1.11 b/devel/doxygen/files/patch-fix_with_libiconv-1.11
new file mode 100644
index 000000000000..64c98676d9aa
--- /dev/null
+++ b/devel/doxygen/files/patch-fix_with_libiconv-1.11
@@ -0,0 +1,11 @@
+--- src/portable.cpp.orig	2007-10-11 14:27:23.000000000 -0500
++++ src/portable.cpp	2007-10-11 14:28:15.000000000 -0500
+@@ -378,7 +378,7 @@
+ #else
+ #define CASTNEEDED(x) (char **)(x)
+ #endif
+-  return iconv(cd,CASTNEEDED(inbuf),inbytesleft,outbuf,outbytesleft);
++  return iconv(cd,inbuf,inbytesleft,outbuf,outbytesleft);
+ }
+ 
+ int portable_iconv_close (void *cd)
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 71b81f8d13bd..3da081991e57 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gconf/Makefile,v 1.2 2006/09/10 00:51:07 mezz Exp $
+#   $MCom: ports/devel/gconf/Makefile,v 1.5 2007/05/19 21:36:05 marcus Exp $
 #
 
 PORTNAME=	gconf
 PORTVERSION=	1.0.9
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/GConf/1.0
diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist
index 7ff843231b9e..7c2bad2632a1 100644
--- a/devel/gconf/pkg-plist
+++ b/devel/gconf/pkg-plist
@@ -58,8 +58,8 @@ share/locale/sv/LC_MESSAGES/GConf.mo
 share/locale/tr/LC_MESSAGES/GConf.mo
 share/locale/uk/LC_MESSAGES/GConf.mo
 share/locale/zh_CN/LC_MESSAGES/GConf.mo
-@dirrm share/gnome/gconf/1
-@dirrm share/gnome/gconf
+@dirrm %%DATADIR%%/1
+@dirrm %%DATADIR%%
 @dirrm lib/GConf/1
 @dirrm include/gconf/1/gconf
 @dirrm include/gconf/1
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index c14e74ea7d64..d647f75d62c3 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gconf2/Makefile,v 1.81 2007/03/06 17:05:38 marcus Exp $
+#   $MCom: ports/devel/gconf2/Makefile,v 1.87 2007/10/15 14:17:14 ahze Exp $
 #
 
 PORTNAME=	gconf2
-PORTVERSION=	2.18.0.1
-PORTREVISION?=	1
+PORTVERSION=	2.20.1
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,8 +22,6 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
-
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 2c95436169b1..d1bea0986e97 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.18.0.1.tar.bz2) = aa0e0a0729fb021bab72b4166fd392f9
-SHA256 (gnome2/GConf-2.18.0.1.tar.bz2) = 58a738f34078de9b3906460a297e751e80a0846e4f3bf33e1884216d0da42bf1
-SIZE (gnome2/GConf-2.18.0.1.tar.bz2) = 1347765
+MD5 (gnome2/GConf-2.20.1.tar.bz2) = 646fc896c6282a8f103365af0fa2e303
+SHA256 (gnome2/GConf-2.20.1.tar.bz2) = 0fb446b87e71fe1089f43e671b5b7689ec91d781b5b2e8f0fc72d4a83a014838
+SIZE (gnome2/GConf-2.20.1.tar.bz2) = 1404919
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 7ccbc022ad7c..968ab8db4d97 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -42,6 +42,7 @@ share/locale/cs/LC_MESSAGES/GConf2.mo
 share/locale/cy/LC_MESSAGES/GConf2.mo
 share/locale/da/LC_MESSAGES/GConf2.mo
 share/locale/de/LC_MESSAGES/GConf2.mo
+share/locale/dz/LC_MESSAGES/GConf2.mo
 share/locale/el/LC_MESSAGES/GConf2.mo
 share/locale/en_CA/LC_MESSAGES/GConf2.mo
 share/locale/en_GB/LC_MESSAGES/GConf2.mo
@@ -76,6 +77,7 @@ share/locale/nb/LC_MESSAGES/GConf2.mo
 share/locale/ne/LC_MESSAGES/GConf2.mo
 share/locale/nl/LC_MESSAGES/GConf2.mo
 share/locale/nn/LC_MESSAGES/GConf2.mo
+share/locale/oc/LC_MESSAGES/GConf2.mo
 share/locale/or/LC_MESSAGES/GConf2.mo
 share/locale/pa/LC_MESSAGES/GConf2.mo
 share/locale/pl/LC_MESSAGES/GConf2.mo
@@ -91,6 +93,7 @@ share/locale/sr/LC_MESSAGES/GConf2.mo
 share/locale/sr@Latn/LC_MESSAGES/GConf2.mo
 share/locale/sv/LC_MESSAGES/GConf2.mo
 share/locale/ta/LC_MESSAGES/GConf2.mo
+share/locale/te/LC_MESSAGES/GConf2.mo
 share/locale/th/LC_MESSAGES/GConf2.mo
 share/locale/tr/LC_MESSAGES/GConf2.mo
 share/locale/uk/LC_MESSAGES/GConf2.mo
@@ -114,11 +117,17 @@ share/sgml/gconf/gconf-1.0.dtd
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @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
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 61a7412703f9..d3ad42259521 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gconfmm26/Makefile,v 1.16 2007/03/10 05:27:50 marcus Exp $
+#   $MCom: ports/devel/gconfmm26/Makefile,v 1.18 2007/09/17 03:25:24 marcus Exp $
 #
 
 PORTNAME=	gconfmm
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo
index 8fe555cf4704..1c8397b0a18a 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconfmm-2.18.0.tar.bz2) = 0771dde14af1443f9ac142010eb3d403
-SHA256 (gnome2/gconfmm-2.18.0.tar.bz2) = 0f82e951069395c28b86205233e2a061505544811448f1bd75a3ee76b44d9316
-SIZE (gnome2/gconfmm-2.18.0.tar.bz2) = 292484
+MD5 (gnome2/gconfmm-2.20.0.tar.bz2) = 24d7e01104394229f28e32a1dc17c819
+SHA256 (gnome2/gconfmm-2.20.0.tar.bz2) = 79fde1ed43605961b2526f6074a57fd7ddfaa1851c4e91609829e439cc1ef2e9
+SIZE (gnome2/gconfmm-2.20.0.tar.bz2) = 283074
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 83d37e03b3e5..8b7ba74840d2 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glade2/Makefile,v 1.16 2005/10/09 20:01:49 marcus Exp $
+#   $MCom: ports/devel/glade2/Makefile,v 1.20 2007/08/04 03:51:29 marcus Exp $
 #
 
 PORTNAME=	glade
 PORTVERSION=	2.12.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -18,8 +18,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A user interface builder for GTK+/GNOME
 
-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/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index c4c9ad6ee8af..b3c4cf12ddd4 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -1,6 +1,6 @@
 bin/glade-2
-share/gnome/applications/glade-2.desktop
-share/gnome/glade-2/gtk/autogen.sh
+share/applications/glade-2.desktop
+share/glade-2/gtk/autogen.sh
 share/gnome/help/glade-2/C/figures/edit-menu.png
 share/gnome/help/glade-2/C/figures/file-menu.png
 share/gnome/help/glade-2/C/figures/glade-windows.png
@@ -23,11 +23,11 @@ share/gnome/help/glade-2/C/glade-user-guide.xml
 share/gnome/help/glade-2/C/legal.xml
 share/gnome/help/glade-2/ro/glade-faq.xml
 share/gnome/help/glade-2/ro/legal.xml
-share/gnome/omf/glade-2/glade-faq-C.omf
-share/gnome/omf/glade-2/glade-faq-ro.omf
-share/gnome/omf/glade-2/glade-user-guide-C.omf
-share/gnome/pixmaps/glade-2.png
-share/gnome/pixmaps/glade-2/glade_logo.png
+share/omf/glade-2/glade-faq-C.omf
+share/omf/glade-2/glade-faq-ro.omf
+share/omf/glade-2/glade-user-guide-C.omf
+share/pixmaps/glade-2.png
+share/pixmaps/glade-2/glade_logo.png
 share/locale/am/LC_MESSAGES/glade-2.0.mo
 share/locale/az/LC_MESSAGES/glade-2.0.mo
 share/locale/be/LC_MESSAGES/glade-2.0.mo
@@ -74,14 +74,19 @@ share/locale/vi/LC_MESSAGES/glade-2.0.mo
 share/locale/yi/LC_MESSAGES/glade-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/glade-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/glade-2.0.mo
-@dirrm share/gnome/pixmaps/glade-2
-@dirrm share/gnome/omf/glade-2
+@dirrm share/pixmaps/glade-2
+@dirrm share/omf/glade-2
 @dirrm share/gnome/help/glade-2/C/figures
 @dirrm share/gnome/help/glade-2/C
 @dirrm share/gnome/help/glade-2/ro/figures
 @dirrm share/gnome/help/glade-2/ro
 @dirrm share/gnome/help/glade-2
-@dirrm share/gnome/glade-2/gtk
-@dirrm share/gnome/glade-2
+@dirrm share/glade-2/gtk
+@dirrm share/glade-2
 @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/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 53dc839ddb10..e302fda2ec5a 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glade3/Makefile,v 1.29 2007/03/13 17:16:00 mezz Exp $
+#   $MCom: ports/devel/glade3/Makefile,v 1.38 2007/09/17 15:59:36 ahze Exp $
 #
 
 PORTNAME=	glade3
-PORTVERSION=	3.2.2
+PORTVERSION=	3.4.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,12 +21,12 @@ USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20 libxml2 gnomeprefix gnomehack \
-		gnomedocutils desktopfileutils
+		gnomedocutils desktopfileutils ltverhack
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
@@ -42,15 +42,16 @@ PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gnome
 CONFIGURE_ARGS+=--disable-gnome
 .endif
 
-.if ${HAVE_GNOME:Mpygtk2}!=""
-USE_PYTHON=	yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-USE_GNOME+=	pygtk2
-PLIST_SUB+=	PYTHON:=""
-.else
+#.if ${HAVE_GNOME:Mpygtk2}!=""
+#USE_PYTHON=	yes
+#.include "${PORTSDIR}/Mk/bsd.python.mk"
+#USE_GNOME+=	pygtk2
+#PLIST_SUB+=	PYTHON:=""
+#CONFIGURE_ARGS+=--enable-python
+#.else
 CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON:="@comment "
-.endif
+#.endif
 
 post-install:
 	${MKDIR} ${PREFIX}/lib/glade3/bindings
diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo
index 8424c436c857..7e9141cdf03b 100644
--- a/devel/glade3/distinfo
+++ b/devel/glade3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glade3-3.2.2.tar.bz2) = 07f24fed99e424988964d6b2d77d5ba7
-SHA256 (gnome2/glade3-3.2.2.tar.bz2) = 28f97d7c41c6e1e1fd91e1e660e49aa0a7dee7839ea92f5cb661e571685b19bd
-SIZE (gnome2/glade3-3.2.2.tar.bz2) = 1429808
+MD5 (gnome2/glade3-3.4.0.tar.bz2) = 7d9354a92d3d95417d1e2d0bc3ebf4f5
+SHA256 (gnome2/glade3-3.4.0.tar.bz2) = af16831ee69f4e323175e0d3710ddc081bbd598abad711cfa141f8a0a9e60331
+SIZE (gnome2/glade3-3.4.0.tar.bz2) = 1493286
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index 6058687a72b2..472a2510c237 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -1,12 +1,7 @@
 bin/glade-3
-include/libgladeui-1.0/gladeui/atk.xpm
-include/libgladeui-1.0/gladeui/fixed_bg.xpm
-include/libgladeui-1.0/gladeui/glade-accumulators.h
 include/libgladeui-1.0/gladeui/glade-app.h
 include/libgladeui-1.0/gladeui/glade-base-editor.h
-include/libgladeui-1.0/gladeui/glade-binding.h
 include/libgladeui-1.0/gladeui/glade-builtins.h
-include/libgladeui-1.0/gladeui/glade-catalog.h
 include/libgladeui-1.0/gladeui/glade-clipboard-view.h
 include/libgladeui-1.0/gladeui/glade-clipboard.h
 include/libgladeui-1.0/gladeui/glade-command.h
@@ -18,308 +13,278 @@ include/libgladeui-1.0/gladeui/glade-design-view.h
 include/libgladeui-1.0/gladeui/glade-editor-property.h
 include/libgladeui-1.0/gladeui/glade-editor.h
 include/libgladeui-1.0/gladeui/glade-fixed.h
-include/libgladeui-1.0/gladeui/glade-id-allocator.h
-include/libgladeui-1.0/gladeui/glade-marshallers.h
-include/libgladeui-1.0/gladeui/glade-palette-box.h
-include/libgladeui-1.0/gladeui/glade-palette-expander.h
+include/libgladeui-1.0/gladeui/glade-gtk.h
+include/libgladeui-1.0/gladeui/glade-inspector.h
 include/libgladeui-1.0/gladeui/glade-palette-item.h
 include/libgladeui-1.0/gladeui/glade-palette.h
 include/libgladeui-1.0/gladeui/glade-parameter.h
 include/libgladeui-1.0/gladeui/glade-parser.h
 include/libgladeui-1.0/gladeui/glade-placeholder.h
-include/libgladeui-1.0/gladeui/glade-popup.h
-include/libgladeui-1.0/gladeui/glade-project-view.h
 include/libgladeui-1.0/gladeui/glade-project.h
 include/libgladeui-1.0/gladeui/glade-property-class.h
 include/libgladeui-1.0/gladeui/glade-property.h
 include/libgladeui-1.0/gladeui/glade-signal-editor.h
 include/libgladeui-1.0/gladeui/glade-signal.h
 include/libgladeui-1.0/gladeui/glade-utils.h
+include/libgladeui-1.0/gladeui/glade-widget-action.h
 include/libgladeui-1.0/gladeui/glade-widget-adaptor.h
 include/libgladeui-1.0/gladeui/glade-widget.h
 include/libgladeui-1.0/gladeui/glade-xml-utils.h
 include/libgladeui-1.0/gladeui/glade.h
-%%PYTHON:%%lib/glade3/bindings/libgladepython.la
-%%PYTHON:%%lib/glade3/bindings/libgladepython.so
+%%GNOME:%%lib/glade3/modules/libgladegnome.a
 %%GNOME:%%lib/glade3/modules/libgladegnome.la
 %%GNOME:%%lib/glade3/modules/libgladegnome.so
+lib/glade3/modules/libgladegtk.a
 lib/glade3/modules/libgladegtk.la
 lib/glade3/modules/libgladegtk.so
+lib/libgladeui-1.a
 lib/libgladeui-1.la
 lib/libgladeui-1.so
-lib/libgladeui-1.so.5
+lib/libgladeui-1.so.7
 libdata/pkgconfig/gladeui-1.0.pc
-%%DOCSDIR%%/GladeApp.html
-%%DOCSDIR%%/GladeClipboard.html
-%%DOCSDIR%%/GladeClipboardView.html
-%%DOCSDIR%%/GladeEditor.html
-%%DOCSDIR%%/GladeEditorProperty.html
-%%DOCSDIR%%/GladeFixed.html
-%%DOCSDIR%%/GladePalette.html
-%%DOCSDIR%%/GladePlaceholder.html
-%%DOCSDIR%%/GladeProject.html
-%%DOCSDIR%%/GladeProjectView.html
-%%DOCSDIR%%/GladeProperty.html
-%%DOCSDIR%%/GladeWidget.html
-%%DOCSDIR%%/catalog.html
-%%DOCSDIR%%/catalogintro.html
-%%DOCSDIR%%/children.html
-%%DOCSDIR%%/core.html
-%%DOCSDIR%%/dockables.html
-%%DOCSDIR%%/gladeui-GladeCommand.html
-%%DOCSDIR%%/gladeui-GladePropertyClass.html
-%%DOCSDIR%%/gladeui-GladeWidgetClass.html
-%%DOCSDIR%%/gladeui-glade-base-editor.html
-%%DOCSDIR%%/gladeui-glade-parameter.html
-%%DOCSDIR%%/gladeui-glade-signal-editor.html
-%%DOCSDIR%%/gladeui-glade-utils.html
-%%DOCSDIR%%/gladeui.devhelp
-%%DOCSDIR%%/gladeui.devhelp2
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/ix01.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/misc.html
-%%DOCSDIR%%/properties.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-%%DOCSDIR%%/widgetclasses.html
-share/gnome/applications/glade-3.desktop
-%%GNOME:%%share/gnome/glade3/catalogs/bonobo.xml
-%%GNOME:%%share/gnome/glade3/catalogs/bonobo.xml.in
-%%GNOME:%%share/gnome/glade3/catalogs/canvas.xml
-%%GNOME:%%share/gnome/glade3/catalogs/canvas.xml.in
-%%GNOME:%%share/gnome/glade3/catalogs/gnome.xml
-%%GNOME:%%share/gnome/glade3/catalogs/gnome.xml.in
-share/gnome/glade3/catalogs/gtk+.xml
-share/gnome/glade3/catalogs/gtk+.xml.in
-share/gnome/glade3/pixmaps/16x16/aboutdialog.png
-share/gnome/glade3/pixmaps/16x16/accellabel.png
-share/gnome/glade3/pixmaps/16x16/alignment.png
-share/gnome/glade3/pixmaps/16x16/arrow.png
-share/gnome/glade3/pixmaps/16x16/aspectframe.png
-share/gnome/glade3/pixmaps/16x16/assistant.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodock.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodockitem.png
-share/gnome/glade3/pixmaps/16x16/button.png
-share/gnome/glade3/pixmaps/16x16/calendar.png
-share/gnome/glade3/pixmaps/16x16/checkbutton.png
-share/gnome/glade3/pixmaps/16x16/checkmenuitem.png
-share/gnome/glade3/pixmaps/16x16/clist.png
-share/gnome/glade3/pixmaps/16x16/colorbutton.png
-share/gnome/glade3/pixmaps/16x16/colorselection.png
-share/gnome/glade3/pixmaps/16x16/colorselectiondialog.png
-share/gnome/glade3/pixmaps/16x16/combo.png
-share/gnome/glade3/pixmaps/16x16/combobox.png
-share/gnome/glade3/pixmaps/16x16/comboboxentry.png
-share/gnome/glade3/pixmaps/16x16/curve.png
-share/gnome/glade3/pixmaps/16x16/custom.png
-share/gnome/glade3/pixmaps/16x16/dialog.png
-share/gnome/glade3/pixmaps/16x16/drawingarea.png
-share/gnome/glade3/pixmaps/16x16/entry.png
-share/gnome/glade3/pixmaps/16x16/eventbox.png
-share/gnome/glade3/pixmaps/16x16/expander.png
-share/gnome/glade3/pixmaps/16x16/filechooserbutton.png
-share/gnome/glade3/pixmaps/16x16/filechooserdialog.png
-share/gnome/glade3/pixmaps/16x16/fileselection.png
-share/gnome/glade3/pixmaps/16x16/fixed.png
-share/gnome/glade3/pixmaps/16x16/fontbutton.png
-share/gnome/glade3/pixmaps/16x16/fontselection.png
-share/gnome/glade3/pixmaps/16x16/fontselectiondialog.png
-share/gnome/glade3/pixmaps/16x16/frame.png
-share/gnome/glade3/pixmaps/16x16/gammacurve.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeabout.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeapp.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeappbar.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomecanvas.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomecolorpicker.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedateedit.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedialog.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedruid.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedruidpageedge.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedruidpagestandard.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomefileentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomefontpicker.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomehref.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeiconentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeiconlist.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeiconselection.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomemessagebox.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomepixmap.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomepixmapentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomepropertybox.png
-share/gnome/glade3/pixmaps/16x16/handlebox.png
-share/gnome/glade3/pixmaps/16x16/hbox.png
-share/gnome/glade3/pixmaps/16x16/hbuttonbox.png
-share/gnome/glade3/pixmaps/16x16/hpaned.png
-share/gnome/glade3/pixmaps/16x16/hruler.png
-share/gnome/glade3/pixmaps/16x16/hscale.png
-share/gnome/glade3/pixmaps/16x16/hscrollbar.png
-share/gnome/glade3/pixmaps/16x16/hseparator.png
-share/gnome/glade3/pixmaps/16x16/iconview.png
-share/gnome/glade3/pixmaps/16x16/image.png
-share/gnome/glade3/pixmaps/16x16/imagemenuitem.png
-share/gnome/glade3/pixmaps/16x16/inputdialog.png
-share/gnome/glade3/pixmaps/16x16/label.png
-share/gnome/glade3/pixmaps/16x16/layout.png
-share/gnome/glade3/pixmaps/16x16/linkbutton.png
-share/gnome/glade3/pixmaps/16x16/list.png
-share/gnome/glade3/pixmaps/16x16/listitem.png
-share/gnome/glade3/pixmaps/16x16/menu.png
-share/gnome/glade3/pixmaps/16x16/menubar.png
-share/gnome/glade3/pixmaps/16x16/menuitem.png
-share/gnome/glade3/pixmaps/16x16/menutoolbutton.png
-share/gnome/glade3/pixmaps/16x16/messagedialog.png
-share/gnome/glade3/pixmaps/16x16/notebook.png
-share/gnome/glade3/pixmaps/16x16/optionmenu.png
-share/gnome/glade3/pixmaps/16x16/pagesetupdialog.png
-share/gnome/glade3/pixmaps/16x16/printdialog.png
-share/gnome/glade3/pixmaps/16x16/progressbar.png
-share/gnome/glade3/pixmaps/16x16/radiobutton.png
-share/gnome/glade3/pixmaps/16x16/radiomenuitem.png
-share/gnome/glade3/pixmaps/16x16/radiotoolbutton.png
-share/gnome/glade3/pixmaps/16x16/recentchooser.png
-share/gnome/glade3/pixmaps/16x16/recentchooserdialog.png
-share/gnome/glade3/pixmaps/16x16/ruler.png
-share/gnome/glade3/pixmaps/16x16/scrolledwindow.png
-share/gnome/glade3/pixmaps/16x16/separatormenuitem.png
-share/gnome/glade3/pixmaps/16x16/separatortoolitem.png
-share/gnome/glade3/pixmaps/16x16/spinbutton.png
-share/gnome/glade3/pixmaps/16x16/statusbar.png
-share/gnome/glade3/pixmaps/16x16/table.png
-share/gnome/glade3/pixmaps/16x16/textview.png
-share/gnome/glade3/pixmaps/16x16/togglebutton.png
-share/gnome/glade3/pixmaps/16x16/toggletoolbutton.png
-share/gnome/glade3/pixmaps/16x16/toolbar.png
-share/gnome/glade3/pixmaps/16x16/toolbutton.png
-share/gnome/glade3/pixmaps/16x16/toolitem.png
-share/gnome/glade3/pixmaps/16x16/treeview.png
-share/gnome/glade3/pixmaps/16x16/vbox.png
-share/gnome/glade3/pixmaps/16x16/vbuttonbox.png
-share/gnome/glade3/pixmaps/16x16/viewport.png
-share/gnome/glade3/pixmaps/16x16/vpaned.png
-share/gnome/glade3/pixmaps/16x16/vruler.png
-share/gnome/glade3/pixmaps/16x16/vscale.png
-share/gnome/glade3/pixmaps/16x16/vscrollbar.png
-share/gnome/glade3/pixmaps/16x16/vseparator.png
-share/gnome/glade3/pixmaps/16x16/window.png
-share/gnome/glade3/pixmaps/22x22/aboutdialog.png
-share/gnome/glade3/pixmaps/22x22/accellabel.png
-share/gnome/glade3/pixmaps/22x22/alignment.png
-share/gnome/glade3/pixmaps/22x22/arrow.png
-share/gnome/glade3/pixmaps/22x22/aspectframe.png
-share/gnome/glade3/pixmaps/22x22/assistant.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodock.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodockitem.png
-share/gnome/glade3/pixmaps/22x22/button.png
-share/gnome/glade3/pixmaps/22x22/calendar.png
-share/gnome/glade3/pixmaps/22x22/checkbutton.png
-share/gnome/glade3/pixmaps/22x22/checkmenuitem.png
-share/gnome/glade3/pixmaps/22x22/clist.png
-share/gnome/glade3/pixmaps/22x22/colorbutton.png
-share/gnome/glade3/pixmaps/22x22/colorselection.png
-share/gnome/glade3/pixmaps/22x22/colorselectiondialog.png
-share/gnome/glade3/pixmaps/22x22/combo.png
-share/gnome/glade3/pixmaps/22x22/combobox.png
-share/gnome/glade3/pixmaps/22x22/comboboxentry.png
-share/gnome/glade3/pixmaps/22x22/curve.png
-share/gnome/glade3/pixmaps/22x22/custom.png
-share/gnome/glade3/pixmaps/22x22/dialog.png
-share/gnome/glade3/pixmaps/22x22/drawingarea.png
-share/gnome/glade3/pixmaps/22x22/entry.png
-share/gnome/glade3/pixmaps/22x22/eventbox.png
-share/gnome/glade3/pixmaps/22x22/expander.png
-share/gnome/glade3/pixmaps/22x22/filechooserbutton.png
-share/gnome/glade3/pixmaps/22x22/filechooserdialog.png
-share/gnome/glade3/pixmaps/22x22/fileselection.png
-share/gnome/glade3/pixmaps/22x22/fixed.png
-share/gnome/glade3/pixmaps/22x22/fontbutton.png
-share/gnome/glade3/pixmaps/22x22/fontselection.png
-share/gnome/glade3/pixmaps/22x22/fontselectiondialog.png
-share/gnome/glade3/pixmaps/22x22/frame.png
-share/gnome/glade3/pixmaps/22x22/gammacurve.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeabout.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeapp.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeappbar.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomecanvas.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomecolorpicker.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedateedit.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedialog.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedruid.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedruidpageedge.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedruidpagestandard.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomefileentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomefontpicker.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomehref.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeiconentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeiconlist.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeiconselection.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomemessagebox.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomepixmap.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomepixmapentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomepropertybox.png
-share/gnome/glade3/pixmaps/22x22/handlebox.png
-share/gnome/glade3/pixmaps/22x22/hbox.png
-share/gnome/glade3/pixmaps/22x22/hbuttonbox.png
-share/gnome/glade3/pixmaps/22x22/hpaned.png
-share/gnome/glade3/pixmaps/22x22/hruler.png
-share/gnome/glade3/pixmaps/22x22/hscale.png
-share/gnome/glade3/pixmaps/22x22/hscrollbar.png
-share/gnome/glade3/pixmaps/22x22/hseparator.png
-share/gnome/glade3/pixmaps/22x22/iconview.png
-share/gnome/glade3/pixmaps/22x22/image.png
-share/gnome/glade3/pixmaps/22x22/imagemenuitem.png
-share/gnome/glade3/pixmaps/22x22/inputdialog.png
-share/gnome/glade3/pixmaps/22x22/label.png
-share/gnome/glade3/pixmaps/22x22/layout.png
-share/gnome/glade3/pixmaps/22x22/linkbutton.png
-share/gnome/glade3/pixmaps/22x22/list.png
-share/gnome/glade3/pixmaps/22x22/listitem.png
-share/gnome/glade3/pixmaps/22x22/menu.png
-share/gnome/glade3/pixmaps/22x22/menubar.png
-share/gnome/glade3/pixmaps/22x22/menuitem.png
-share/gnome/glade3/pixmaps/22x22/menutoolbutton.png
-share/gnome/glade3/pixmaps/22x22/messagedialog.png
-share/gnome/glade3/pixmaps/22x22/notebook.png
-share/gnome/glade3/pixmaps/22x22/optionmenu.png
-share/gnome/glade3/pixmaps/22x22/pagesetupdialog.png
-share/gnome/glade3/pixmaps/22x22/printdialog.png
-share/gnome/glade3/pixmaps/22x22/progressbar.png
-share/gnome/glade3/pixmaps/22x22/radiobutton.png
-share/gnome/glade3/pixmaps/22x22/radiomenuitem.png
-share/gnome/glade3/pixmaps/22x22/radiotoolbutton.png
-share/gnome/glade3/pixmaps/22x22/recentchooser.png
-share/gnome/glade3/pixmaps/22x22/recentchooserdialog.png
-share/gnome/glade3/pixmaps/22x22/ruler.png
-share/gnome/glade3/pixmaps/22x22/scrolledwindow.png
-share/gnome/glade3/pixmaps/22x22/separatormenuitem.png
-share/gnome/glade3/pixmaps/22x22/separatortoolitem.png
-share/gnome/glade3/pixmaps/22x22/spinbutton.png
-share/gnome/glade3/pixmaps/22x22/statusbar.png
-share/gnome/glade3/pixmaps/22x22/table.png
-share/gnome/glade3/pixmaps/22x22/textview.png
-share/gnome/glade3/pixmaps/22x22/togglebutton.png
-share/gnome/glade3/pixmaps/22x22/toggletoolbutton.png
-share/gnome/glade3/pixmaps/22x22/toolbar.png
-share/gnome/glade3/pixmaps/22x22/toolbutton.png
-share/gnome/glade3/pixmaps/22x22/toolitem.png
-share/gnome/glade3/pixmaps/22x22/treeview.png
-share/gnome/glade3/pixmaps/22x22/vbox.png
-share/gnome/glade3/pixmaps/22x22/vbuttonbox.png
-share/gnome/glade3/pixmaps/22x22/viewport.png
-share/gnome/glade3/pixmaps/22x22/vpaned.png
-share/gnome/glade3/pixmaps/22x22/vruler.png
-share/gnome/glade3/pixmaps/22x22/vscale.png
-share/gnome/glade3/pixmaps/22x22/vscrollbar.png
-share/gnome/glade3/pixmaps/22x22/vseparator.png
-share/gnome/glade3/pixmaps/22x22/window.png
-share/gnome/glade3/pixmaps/devhelp.png
-share/gnome/glade3/pixmaps/plus.png
-share/gnome/glade3/pixmaps/selector.png
+share/applications/glade-3.desktop
+%%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml
+%%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml.in
+%%GNOME:%%%%DATADIR%%/catalogs/canvas.xml
+%%GNOME:%%%%DATADIR%%/catalogs/canvas.xml.in
+%%GNOME:%%%%DATADIR%%/catalogs/gnome.xml
+%%GNOME:%%%%DATADIR%%/catalogs/gnome.xml.in
+%%DATADIR%%/catalogs/gtk+.xml
+%%DATADIR%%/catalogs/gtk+.xml.in
+%%DATADIR%%/catalogs/gtkunixprint.xml
+%%DATADIR%%/catalogs/gtkunixprint.xml.in
+%%DATADIR%%/pixmaps/atk.png
+%%DATADIR%%/pixmaps/devhelp.png
+%%DATADIR%%/pixmaps/drag-resize.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dock.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dockitem.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-about.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-app.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-appbar.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-canvas.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-colorpicker.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dateedit.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dialog.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druid.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpageedge.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpagestandard.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-entry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fileentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fontpicker.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-href.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconlist.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconselection.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-messagebox.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmap.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmapentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-propertybox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-alignment.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-arrow.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aspectframe.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-assistant.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-button.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-calendar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-checkmenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-clist.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorselection.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-combo.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxentry.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-curve.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-custom.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-default.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-dialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-drawingarea.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-entry.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-eventbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-expander.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserwidget.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fileselection.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fixed.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontselection.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-frame.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-gammacurve.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-gtktextview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-handlebox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hpaned.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hruler.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hseparator.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-iconview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-image.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-imagemenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-inputdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-label.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-layout.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-linkbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-list.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-listitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menu.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menubar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menutoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-messagedialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-notebook.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-optionmenu.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-printdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiobutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiomenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooser.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-ruler.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scrolledwindow.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separatormenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separatortoolitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-spinbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-statusbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-table.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-textview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-togglebutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treeview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-viewport.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vpaned.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vruler.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vscale.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-window.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dock.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dockitem.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-about.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-app.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-appbar.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-canvas.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-colorpicker.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dateedit.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dialog.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druid.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpageedge.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpagestandard.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-entry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fileentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fontpicker.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-href.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconlist.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconselection.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-messagebox.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmap.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmapentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-propertybox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-alignment.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-arrow.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aspectframe.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-assistant.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-button.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-calendar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-checkbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-checkmenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-clist.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorselection.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-combo.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-combobox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxentry.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-curve.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-custom.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-default.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-dialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-drawingarea.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-entry.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-eventbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-expander.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserwidget.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fileselection.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fixed.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontselection.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-frame.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-gammacurve.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-handlebox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hpaned.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hruler.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hscale.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hseparator.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-iconview.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-image.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-imagemenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-inputdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-label.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-layout.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-linkbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-list.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-listitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menu.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menubar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menutoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-messagedialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-notebook.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-optionmenu.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-printdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-progressbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiobutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiomenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooser.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-ruler.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scrolledwindow.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separatormenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separatortoolitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-spinbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-statusbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-table.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-textview.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-togglebutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treeview.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-viewport.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vpaned.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vruler.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vscale.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vseparator.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-window.png
+%%DATADIR%%/pixmaps/plus.png
+%%DATADIR%%/pixmaps/selector.png
 share/gnome/help/glade/C/figures/main-window.png
 share/gnome/help/glade/C/glade.xml
 share/gnome/help/glade/C/legal.xml
@@ -335,15 +300,12 @@ share/gnome/help/glade/es/legal.xml
 share/gnome/help/glade/fr/figures/main-window.png
 share/gnome/help/glade/fr/glade.xml
 share/gnome/help/glade/fr/legal.xml
+share/gnome/help/glade/oc/figures/main-window.png
+share/gnome/help/glade/oc/glade.xml
+share/gnome/help/glade/oc/legal.xml
 share/gnome/help/glade/sv/figures/main-window.png
 share/gnome/help/glade/sv/glade.xml
 share/gnome/help/glade/sv/legal.xml
-share/gnome/omf/glade/glade-C.omf
-share/gnome/omf/glade/glade-bg.omf
-share/gnome/omf/glade/glade-en_GB.omf
-share/gnome/omf/glade/glade-es.omf
-share/gnome/omf/glade/glade-fr.omf
-share/gnome/omf/glade/glade-sv.omf
 share/icons/hicolor/16x16/apps/glade-3.png
 share/icons/hicolor/22x22/apps/glade-3.png
 share/icons/hicolor/24x24/apps/glade-3.png
@@ -353,14 +315,17 @@ share/icons/hicolor/scalable/apps/glade-3.svg
 share/locale/ar/LC_MESSAGES/glade3.mo
 share/locale/az/LC_MESSAGES/glade3.mo
 share/locale/bg/LC_MESSAGES/glade3.mo
+share/locale/bn/LC_MESSAGES/glade3.mo
+share/locale/bn_IN/LC_MESSAGES/glade3.mo
 share/locale/ca/LC_MESSAGES/glade3.mo
 share/locale/da/LC_MESSAGES/glade3.mo
 share/locale/de/LC_MESSAGES/glade3.mo
-share/locale/dz/LC_MESSAGES/glade3.mo
 share/locale/el/LC_MESSAGES/glade3.mo
 share/locale/en_CA/LC_MESSAGES/glade3.mo
 share/locale/en_GB/LC_MESSAGES/glade3.mo
 share/locale/es/LC_MESSAGES/glade3.mo
+share/locale/et/LC_MESSAGES/glade3.mo
+share/locale/fi/LC_MESSAGES/glade3.mo
 share/locale/fr/LC_MESSAGES/glade3.mo
 share/locale/gl/LC_MESSAGES/glade3.mo
 share/locale/hu/LC_MESSAGES/glade3.mo
@@ -373,15 +338,20 @@ share/locale/ml/LC_MESSAGES/glade3.mo
 share/locale/ms/LC_MESSAGES/glade3.mo
 share/locale/nb/LC_MESSAGES/glade3.mo
 share/locale/nn/LC_MESSAGES/glade3.mo
+share/locale/oc/LC_MESSAGES/glade3.mo
+share/locale/or/LC_MESSAGES/glade3.mo
 share/locale/pa/LC_MESSAGES/glade3.mo
 share/locale/pl/LC_MESSAGES/glade3.mo
 share/locale/pt/LC_MESSAGES/glade3.mo
 share/locale/pt_BR/LC_MESSAGES/glade3.mo
 share/locale/ru/LC_MESSAGES/glade3.mo
+share/locale/si/LC_MESSAGES/glade3.mo
 share/locale/sk/LC_MESSAGES/glade3.mo
+share/locale/sl/LC_MESSAGES/glade3.mo
 share/locale/sq/LC_MESSAGES/glade3.mo
 share/locale/sv/LC_MESSAGES/glade3.mo
 share/locale/ta/LC_MESSAGES/glade3.mo
+share/locale/te/LC_MESSAGES/glade3.mo
 share/locale/th/LC_MESSAGES/glade3.mo
 share/locale/tr/LC_MESSAGES/glade3.mo
 share/locale/uk/LC_MESSAGES/glade3.mo
@@ -389,9 +359,18 @@ share/locale/vi/LC_MESSAGES/glade3.mo
 share/locale/zh_CN/LC_MESSAGES/glade3.mo
 share/locale/zh_HK/LC_MESSAGES/glade3.mo
 share/locale/zh_TW/LC_MESSAGES/glade3.mo
-@dirrm share/gnome/omf/glade
+share/omf/glade/glade-C.omf
+share/omf/glade/glade-bg.omf
+share/omf/glade/glade-en_GB.omf
+share/omf/glade/glade-es.omf
+share/omf/glade/glade-fr.omf
+share/omf/glade/glade-oc.omf
+share/omf/glade/glade-sv.omf
+@dirrm share/omf/glade
 @dirrm share/gnome/help/glade/sv/figures
 @dirrm share/gnome/help/glade/sv
+@dirrm share/gnome/help/glade/oc/figures
+@dirrm share/gnome/help/glade/oc
 @dirrm share/gnome/help/glade/fr/figures
 @dirrm share/gnome/help/glade/fr
 @dirrm share/gnome/help/glade/es/figures
@@ -403,12 +382,14 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
 @dirrm share/gnome/help/glade/C/figures
 @dirrm share/gnome/help/glade/C
 @dirrm share/gnome/help/glade
-@dirrm share/gnome/glade3/pixmaps/22x22
-@dirrm share/gnome/glade3/pixmaps/16x16
-@dirrm share/gnome/glade3/pixmaps
-@dirrm share/gnome/glade3/catalogs
-@dirrm share/gnome/glade3
-@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/pixmaps/hicolor/22x22/actions
+@dirrm %%DATADIR%%/pixmaps/hicolor/22x22
+@dirrm %%DATADIR%%/pixmaps/hicolor/16x16/actions
+@dirrm %%DATADIR%%/pixmaps/hicolor/16x16
+@dirrm %%DATADIR%%/pixmaps/hicolor
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/catalogs
+@dirrm %%DATADIR%%
 @dirrm lib/glade3/modules
 @dirrm lib/glade3/bindings
 @dirrm lib/glade3
@@ -418,5 +399,12 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 2c4290392809..fb55b8177877 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.91 2006/10/05 06:55:34 mezz Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.105 2007/10/16 12:35:26 ahze Exp $
 #
 
 PORTNAME=	glib
-PORTVERSION=	2.12.13
+PORTVERSION=	2.14.2
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -28,6 +28,8 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
+LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
+
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
@@ -36,7 +38,8 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
 		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
-		--disable-man --without-xml-catalog
+		--disable-man --without-xml-catalog \
+		--with-pcre=system
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 9c979acf47f9..650782e3bdcd 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.12.13.tar.bz2) = d76124236e4e216e8c0861341e967a76
-SHA256 (gnome2/glib-2.12.13.tar.bz2) = 1253d563ca2e50292d924849fe3a23c3b7bc707ab8b79bda19319f9d192b0e8e
-SIZE (gnome2/glib-2.12.13.tar.bz2) = 2938164
+MD5 (gnome2/glib-2.14.2.tar.bz2) = fca5d26c8efea4e6e547c81c801bf67c
+SHA256 (gnome2/glib-2.14.2.tar.bz2) = bd6767cc7c8d9551df0fb3e6d40706746723f6daa0ecd4a78facffc40f9d8a97
+SIZE (gnome2/glib-2.14.2.tar.bz2) = 3340273
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
index f5799d902c16..8a89b6e972e9 100644
--- a/devel/glib20/files/patch-ag
+++ b/devel/glib20/files/patch-ag
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue May  1 20:39:42 2007
-+++ Makefile.in	Tue May  1 20:40:23 2007
-@@ -239,7 +239,7 @@ target_alias = @target_alias@
+--- Makefile.in.orig	Thu May  3 15:19:30 2007
++++ Makefile.in	Thu May  3 15:19:44 2007
+@@ -248,7 +248,7 @@ target_alias = @target_alias@
  
  AUTOMAKE_OPTIONS = 1.7
  
@@ -9,7 +9,7 @@
  
  bin_SCRIPTS = glib-gettextize
  
-@@ -292,8 +292,8 @@ BUILT_EXTRA_DIST = \
+@@ -301,8 +301,8 @@ BUILT_EXTRA_DIST = \
  	config.h.win32		\
  	gtk-doc.make
  
diff --git a/devel/glib20/files/patch-glib_gregex.c b/devel/glib20/files/patch-glib_gregex.c
new file mode 100644
index 000000000000..ef7f0a87b9ff
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gregex.c
@@ -0,0 +1,13 @@
+--- glib/gregex.c.orig	2007-09-09 18:35:32.000000000 -0400
++++ glib/gregex.c	2007-09-09 18:36:05.000000000 -0400
+@@ -164,8 +164,10 @@ match_error (gint errcode)
+     case PCRE_ERROR_DFA_RECURSE:
+     case PCRE_ERROR_RECURSIONLIMIT:
+       return _("recursion limit reached");
++#ifdef PCRE_ERROR_NULLWSLIMIT
+     case PCRE_ERROR_NULLWSLIMIT:
+       return _("workspace limit for empty substrings reached");
++#endif
+     case PCRE_ERROR_BADNEWLINE:
+       return _("invalid combination of newline flags");
+     default:
diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c
index 8fd5f9ead041..95a02e475ac0 100644
--- a/devel/glib20/files/patch-glib_gutils.c
+++ b/devel/glib20/files/patch-glib_gutils.c
@@ -5,7 +5,7 @@
  
        if (!data_dirs || !data_dirs[0])
 -          data_dirs = "/usr/local/share/:/usr/share/";
-+          data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
++          data_dirs = "/usr/local/share/";
  
        data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
index 47ca3e672044..586d7f80bd62 100644
--- a/devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c
@@ -1,7 +1,3 @@
-
-$FreeBSD$
-  $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.19 2006/10/10 20:22:06 mezz Exp $
-
 --- gmodule/gmodule-dl.c.orig	Sat Feb 17 08:28:07 2001
 +++ gmodule/gmodule-dl.c	Fri Jan 18 09:48:45 2002
 @@ -104,6 +104,7 @@
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 55ee6cae4626..1caac4492aca 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -41,8 +41,10 @@ include/glib-2.0/glib/gqsort.h
 include/glib-2.0/glib/gquark.h
 include/glib-2.0/glib/gqueue.h
 include/glib-2.0/glib/grand.h
+include/glib-2.0/glib/gregex.h
 include/glib-2.0/glib/grel.h
 include/glib-2.0/glib/gscanner.h
+include/glib-2.0/glib/gsequence.h
 include/glib-2.0/glib/gshell.h
 include/glib-2.0/glib/gslice.h
 include/glib-2.0/glib/gslist.h
@@ -105,6 +107,7 @@ share/glib-2.0/gettext/mkinstalldirs
 share/glib-2.0/gettext/po/Makefile.in.in
 share/locale/am/LC_MESSAGES/glib20.mo
 share/locale/ar/LC_MESSAGES/glib20.mo
+share/locale/as/LC_MESSAGES/glib20.mo
 share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/be/LC_MESSAGES/glib20.mo
 share/locale/be@latin/LC_MESSAGES/glib20.mo
@@ -141,10 +144,12 @@ share/locale/is/LC_MESSAGES/glib20.mo
 share/locale/it/LC_MESSAGES/glib20.mo
 share/locale/ja/LC_MESSAGES/glib20.mo
 share/locale/ka/LC_MESSAGES/glib20.mo
+share/locale/kn/LC_MESSAGES/glib20.mo
 share/locale/ko/LC_MESSAGES/glib20.mo
 share/locale/ku/LC_MESSAGES/glib20.mo
 share/locale/lt/LC_MESSAGES/glib20.mo
 share/locale/lv/LC_MESSAGES/glib20.mo
+share/locale/mg/LC_MESSAGES/glib20.mo
 share/locale/mk/LC_MESSAGES/glib20.mo
 share/locale/ml/LC_MESSAGES/glib20.mo
 share/locale/mn/LC_MESSAGES/glib20.mo
@@ -153,6 +158,7 @@ share/locale/nb/LC_MESSAGES/glib20.mo
 share/locale/ne/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
+share/locale/oc/LC_MESSAGES/glib20.mo
 share/locale/or/LC_MESSAGES/glib20.mo
 share/locale/pa/LC_MESSAGES/glib20.mo
 share/locale/pl/LC_MESSAGES/glib20.mo
@@ -204,6 +210,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/sr@ije
 @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
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
@@ -214,3 +224,5 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index e0fdc6263b20..b733ebd0294b 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glibmm/Makefile,v 1.39 2006/12/30 18:56:48 marcus Exp $
+#   $MCom: ports/devel/glibmm/Makefile,v 1.48 2007/10/06 21:15:01 mezz Exp $
 #
 
 PORTNAME=	glibmm
-PORTVERSION=	2.12.10
+PORTVERSION=	2.14.1
 PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	devel
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 9da3ca6bf376..74627bfd2c14 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.12.10.tar.bz2) = 85830693d669f0d86d6e64db3b57f581
-SHA256 (gnome2/glibmm-2.12.10.tar.bz2) = 21b760b1567f9fcd9ea5244f02fdb0583852f7f4c513ab83726a1a076093320b
-SIZE (gnome2/glibmm-2.12.10.tar.bz2) = 2360587
+MD5 (gnome2/glibmm-2.14.1.tar.bz2) = b75877e454afa956a1e86a89ab1fa9b0
+SHA256 (gnome2/glibmm-2.14.1.tar.bz2) = 963b47b530a0cead2148295d8929b957db53578ca80dee362d1dbd675ea1b2d5
+SIZE (gnome2/glibmm-2.14.1.tar.bz2) = 9273164
diff --git a/devel/glibmm/files/patch-glib_glibmm_date.cc b/devel/glibmm/files/patch-glib_glibmm_date.cc
index 66c85602135e..539778d9a9b1 100644
--- a/devel/glibmm/files/patch-glib_glibmm_date.cc
+++ b/devel/glibmm/files/patch-glib_glibmm_date.cc
@@ -1,19 +1,16 @@
---- glib/glibmm/date.cc.orig	Sun Apr 22 12:28:36 2007
-+++ glib/glibmm/date.cc	Sun Apr 22 12:28:48 2007
-@@ -73,7 +73,7 @@
- 
+--- glib/glibmm/date.cc.orig	Sun May  6 00:19:51 2007
++++ glib/glibmm/date.cc	Sun May  6 00:21:36 2007
+@@ -72,12 +72,14 @@ void Date::set_parse(const Glib::ustring
+ }
  
  #ifndef GLIBMM_DISABLE_DEPRECATED
--
 +#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
  
- //Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32)
- //That would make the set_time() method overload impossible.
-@@ -84,7 +84,7 @@
+ void Date::set_time(GTime time)
+ {
+   //This method, and the C function that it wraps, are deprecated.
    g_date_set_time(&gobject_, time);
  }
- #endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
--
 +#endif
  #endif // GLIBMM_DISABLE_DEPRECATED
  
diff --git a/devel/glibmm/files/patch-glib_glibmm_date.h b/devel/glibmm/files/patch-glib_glibmm_date.h
index fdf6ccc9e525..12a66044f382 100644
--- a/devel/glibmm/files/patch-glib_glibmm_date.h
+++ b/devel/glibmm/files/patch-glib_glibmm_date.h
@@ -1,19 +1,17 @@
---- glib/glibmm/date.h.orig	Sun Apr 22 12:29:49 2007
-+++ glib/glibmm/date.h	Sun Apr 22 12:30:39 2007
-@@ -121,7 +121,7 @@
- 
+--- glib/glibmm/date.h.orig	Sun May  6 00:22:03 2007
++++ glib/glibmm/date.h	Sun May  6 00:22:31 2007
+@@ -120,6 +120,7 @@ enum DMY
+   void set_parse (const Glib::ustring& str);
  
    #ifndef GLIBMM_DISABLE_DEPRECATED
--
 +#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
-   
-   //Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32)
-   //That would make the set_time() method overload impossible.
-@@ -134,7 +134,7 @@
+ 
+   /** Sets the value of a date from a GTime (time_t) value. 
+    *
+@@ -128,6 +129,7 @@ enum DMY
+    * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&).
     */
    void set_time(GTime time);
-   #endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
--
 +#endif
    #endif // GLIBMM_DISABLE_DEPRECATED
  
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 324f5d42bd96..f816389349f0 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -16,6 +16,7 @@ include/glibmm-%%API_VERSION%%/glibmm/i18n.h
 include/glibmm-%%API_VERSION%%/glibmm/init.h
 include/glibmm-%%API_VERSION%%/glibmm/interface.h
 include/glibmm-%%API_VERSION%%/glibmm/iochannel.h
+include/glibmm-%%API_VERSION%%/glibmm/keyfile.h
 include/glibmm-%%API_VERSION%%/glibmm/listhandle.h
 include/glibmm-%%API_VERSION%%/glibmm/main.h
 include/glibmm-%%API_VERSION%%/glibmm/markup.h
@@ -32,12 +33,14 @@ include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/interface_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/keyfile_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/markup_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/module_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/object_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/optioncontext_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/optionentry_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/optiongroup_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/regex_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/shell_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/spawn_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h
@@ -48,6 +51,7 @@ include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h
 include/glibmm-%%API_VERSION%%/glibmm/quark.h
 include/glibmm-%%API_VERSION%%/glibmm/random.h
 include/glibmm-%%API_VERSION%%/glibmm/refptr.h
+include/glibmm-%%API_VERSION%%/glibmm/regex.h
 include/glibmm-%%API_VERSION%%/glibmm/sarray.h
 include/glibmm-%%API_VERSION%%/glibmm/shell.h
 include/glibmm-%%API_VERSION%%/glibmm/signalproxy.h
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 50aae175f314..17e0d6b8962a 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-build/Makefile,v 1.1 2007/02/12 05:30:37 mezz Exp $
+#   $MCom: ports/devel/gnome-build/Makefile,v 1.5 2007/09/09 22:45:25 mezz Exp $
 #
 
 PORTNAME=	gnome-build
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/devel/gnome-build/pkg-plist b/devel/gnome-build/pkg-plist
index c0420a5eac74..6820a0597076 100644
--- a/devel/gnome-build/pkg-plist
+++ b/devel/gnome-build/pkg-plist
@@ -22,13 +22,13 @@ lib/libgbf-widgets-1.la
 lib/libgbf-widgets-1.so
 lib/libgbf-widgets-1.so.1
 libdata/pkgconfig/gnome-build-1.0.pc
-share/gnome/gnome-build/GBF/AmFiles.pm
-share/gnome/gnome-build/GBF/General.pm
-share/gnome/gnome-build/GBF/Make.pm
-share/gnome/gnome-build/glade/create_dialogs.glade
-share/gnome/gnome-build/glade/gbf-am-dialogs.glade
-share/gnome/pixmaps/gbf-build.png
-share/gnome/pixmaps/gbf-install.png
+share/gnome-build/GBF/AmFiles.pm
+share/gnome-build/GBF/General.pm
+share/gnome-build/GBF/Make.pm
+share/gnome-build/glade/create_dialogs.glade
+share/gnome-build/glade/gbf-am-dialogs.glade
+share/pixmaps/gbf-build.png
+share/pixmaps/gbf-install.png
 share/locale/am/LC_MESSAGES/gbf-1.mo
 share/locale/ar/LC_MESSAGES/gbf-1.mo
 share/locale/az/LC_MESSAGES/gbf-1.mo
@@ -69,12 +69,14 @@ share/locale/sv/LC_MESSAGES/gbf-1.mo
 share/locale/uk/LC_MESSAGES/gbf-1.mo
 share/locale/vi/LC_MESSAGES/gbf-1.mo
 share/locale/zh_CN/LC_MESSAGES/gbf-1.mo
-@dirrm share/gnome/gnome-build/glade
-@dirrm share/gnome/gnome-build/GBF
-@dirrm share/gnome/gnome-build
+@dirrm share/gnome-build/glade
+@dirrm share/gnome-build/GBF
+@dirrm share/gnome-build
 @dirrm lib/gnome-build-1.0/backends
 @dirrm lib/gnome-build-1.0
 @dirrm include/gnome-build-1.0/gbf
 @dirrm include/gnome-build-1.0
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index e1f9bead80dc..45c002dc1d57 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/devel/gnomecommon/Makefile,v 1.5 2005/09/20 09:39:51 ahze Exp $
+#    $MCom: ports/devel/gnome-common/Makefile,v 1.7 2007/09/17 18:37:36 ahze Exp $
 #
 
 PORTNAME=	gnome-common
-PORTVERSION=	2.18.0
+PORTVERSION=	2.20.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
index 424c4613374f..394b5ed28354 100644
--- a/devel/gnome-common/distinfo
+++ b/devel/gnome-common/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-common-2.18.0.tar.bz2) = 567172e685fc0783b1d6ab9843a85d6a
-SHA256 (gnome2/gnome-common-2.18.0.tar.bz2) = ba28c1017e7e4212db16ada3f44cb446b6637c9c4fe16c0e2c2a51c94c46bc5b
-SIZE (gnome2/gnome-common-2.18.0.tar.bz2) = 62628
+MD5 (gnome2/gnome-common-2.20.0.tar.bz2) = 89e47677fb72695c75d2cefac84ff9f1
+SHA256 (gnome2/gnome-common-2.20.0.tar.bz2) = 0e807cfe74a684c494a0949b7f96d231660f323253a89053e3ec32c4f518c8d9
+SIZE (gnome2/gnome-common-2.20.0.tar.bz2) = 64309
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index e539021734cc..4d27d5d390c5 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-crash
 PORTVERSION=	0.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-crash/0.0
diff --git a/devel/gnome-crash/files/patch-src::Makefile.in b/devel/gnome-crash/files/patch-src::Makefile.in
index b9ede6796209..fab997dbbb77 100644
--- a/devel/gnome-crash/files/patch-src::Makefile.in
+++ b/devel/gnome-crash/files/patch-src::Makefile.in
@@ -7,8 +7,8 @@ $FreeBSD$
  gdb_DATA = gdb-cmd
  
  #CFLAGS+=-Werror
--INCLUDES =  	-I$(top_srcdir)/intl						-I$(top_builddir)/intl						-I$(includedir) $(EXTRA_GNOME_CFLAGS)				-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"			-DGNOME_CRASH_GLADE_DIR=\""$(gladedir)"\"			-DGNOME_CRASH_GDB_DIR=\""$(gdbdir)"\"				-DGNOME_CRASH_ICON_DIR=\""$(datadir)/pixmaps"\"			-DGNOME_CRASH_DATA_DIR=\""$(datadir)/gnome-crash"\"
-+INCLUDES =  	$(GNOME_PRINT_CFLAGS)	-I$(top_srcdir)/intl						-I$(top_builddir)/intl						-I$(includedir) $(EXTRA_GNOME_CFLAGS)				-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"			-DGNOME_CRASH_GLADE_DIR=\""$(gladedir)"\"			-DGNOME_CRASH_GDB_DIR=\""$(gdbdir)"\"				-DGNOME_CRASH_ICON_DIR=\""$(datadir)/pixmaps"\"			-DGNOME_CRASH_DATA_DIR=\""$(datadir)/gnome-crash"\"
+-INCLUDES =  	-I$(top_srcdir)/intl						-I$(top_builddir)/intl						-I$(includedir) $(EXTRA_GNOME_CFLAGS)				-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			-DGNOME_CRASH_GLADE_DIR=\""$(gladedir)"\"			-DGNOME_CRASH_GDB_DIR=\""$(gdbdir)"\"				-DGNOME_CRASH_ICON_DIR=\""$(datadir)/pixmaps"\"			-DGNOME_CRASH_DATA_DIR=\""$(datadir)/gnome-crash"\"
++INCLUDES =  	$(GNOME_PRINT_CFLAGS)	-I$(top_srcdir)/intl						-I$(top_builddir)/intl						-I$(includedir) $(EXTRA_GNOME_CFLAGS)				-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			-DGNOME_CRASH_GLADE_DIR=\""$(gladedir)"\"			-DGNOME_CRASH_GDB_DIR=\""$(gdbdir)"\"				-DGNOME_CRASH_ICON_DIR=\""$(datadir)/pixmaps"\"			-DGNOME_CRASH_DATA_DIR=\""$(datadir)/gnome-crash"\"
  
  
  bin_PROGRAMS = gnome-crash
diff --git a/devel/gnome-crash/pkg-plist b/devel/gnome-crash/pkg-plist
index 11469ae01f93..0fbb0a44e8c8 100644
--- a/devel/gnome-crash/pkg-plist
+++ b/devel/gnome-crash/pkg-plist
@@ -1,12 +1,12 @@
 bin/gnome-crash
-share/gnome/apps/Utilities/gnome-crash.desktop
-share/gnome/gnome-crash/gdb/gdb-cmd
-share/gnome/gnome-crash/glade/about.glade
-share/gnome/gnome-crash/glade/gnome-crash.glade
-share/gnome/gnome-crash/gnome-crash-animation.png
-share/gnome/mime-info/gnome-crash.keys
-share/gnome/mime-info/gnome-crash.mime
-share/gnome/pixmaps/gnome-crash-icon.png
-@dirrm share/gnome/gnome-crash/glade
-@dirrm share/gnome/gnome-crash/gdb
-@dirrm share/gnome/gnome-crash
+share/apps/Utilities/gnome-crash.desktop
+share/gnome-crash/gdb/gdb-cmd
+share/gnome-crash/glade/about.glade
+share/gnome-crash/glade/gnome-crash.glade
+share/gnome-crash/gnome-crash-animation.png
+share/mime-info/gnome-crash.keys
+share/mime-info/gnome-crash.mime
+share/pixmaps/gnome-crash-icon.png
+@dirrm share/gnome-crash/glade
+@dirrm share/gnome-crash/gdb
+@dirrm share/gnome-crash
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 798462e4d3aa..4946aa02a9a1 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,16 +3,15 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.167 2007/03/13 13:02:20 ahze Exp $
+#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.179 2007/10/22 21:07:02 ahze Exp $
 #
 
 PORTNAME=	gnome-vfs
-PORTVERSION=	2.18.1
+PORTVERSION=	2.20.0
 PORTREVISION?=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-vfs-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index f5b3aa6c4eb0..dbfa59bea19e 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.18.1.tar.bz2) = bf4a6d95180d05981893e5d021c6695c
-SHA256 (gnome2/gnome-vfs-2.18.1.tar.bz2) = 098d920cb7d4a50e245deaafabfd8e06b86c88771d56be567597c09c09207f5e
-SIZE (gnome2/gnome-vfs-2.18.1.tar.bz2) = 1916897
+MD5 (gnome2/gnome-vfs-2.20.0.tar.bz2) = b9fe0a066d0e693e74a000e55338235b
+SHA256 (gnome2/gnome-vfs-2.20.0.tar.bz2) = cd95ec5a4808799f033dcb9daf37ed38436c594d4014e5804967fa9e5893e91f
+SIZE (gnome2/gnome-vfs-2.20.0.tar.bz2) = 1918358
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c
new file mode 100644
index 000000000000..c7fb1cf36dba
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/gnome-vfs-filesystem-type.c.orig	2007-09-17 14:48:45.000000000 -0400
++++ libgnomevfs/gnome-vfs-filesystem-type.c	2007-09-17 14:50:06.000000000 -0400
+@@ -65,6 +65,8 @@ static struct FSInfo fs_data[] = {
+ 	{ "msdosfs"  , N_("MSDOS Volume"), 0 },
+ 	{ "nfs"      , N_("NFS Network Volume"), 1 },
+ 	{ "ntfs"     , N_("Windows NT Volume"), 0 },
++	{ "nullfs"   , N_("BSD Loopback Volume"), 1 },
++	{ "zfs"      , N_("ZFS Volume"), 1 },
+ 	{ "nwfs"     , N_("Netware Volume"), 0 },
+ 	{ "proc"     , N_("System Volume"), 0 },
+ 	{ "procfs"   , N_("System Volume"), 0 },
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
deleted file mode 100644
index 068d1773a9e9..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Thu Sep 15 07:02:53 2005
-+++ libgnomevfs/gnome-vfs-utils.c	Sat Oct 22 02:12:32 2005
-@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const
- 	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
- 		full_filename = g_build_filename (*temp_paths,
- 						  "share",
-+						  "gnome",
- 						  "pixmaps",
- 						  relative_filename,
- 						  NULL);
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
index aaa8ff29d555..a9879578af2c 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
@@ -5,7 +5,7 @@
    xdg_data_dirs = getenv ("XDG_DATA_DIRS");
    if (xdg_data_dirs == NULL)
 -    xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+    xdg_data_dirs = "%%LOCALBASE%%/share/gnome/:%%LOCALBASE%%/share/:/usr/share/";
++    xdg_data_dirs = "%%LOCALBASE%%/share/";
  
    ptr = xdg_data_dirs;
  
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index f920c5742ca1..dffcc3de9164 100644
--- a/devel/gnome-vfs/pkg-deinstall.in
+++ b/devel/gnome-vfs/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.12 2006/12/18 12:34:11 ahze Exp $
+#   $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.15 2007/08/15 17:52:05 mezz Exp $
 #
 # Restore gconf keys of libgnome.
 
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index ff583b731c6d..ea794171815f 100644
--- a/devel/gnome-vfs/pkg-install.in
+++ b/devel/gnome-vfs/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.12 2006/12/18 12:34:11 ahze Exp $
+#   $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.15 2007/08/15 17:52:05 mezz Exp $
 #
 # Restore gconf keys of libgnome.
 
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 81ed5c9a097f..606b21cb5f72 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -28,12 +28,12 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h
@@ -160,6 +160,7 @@ share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -176,6 +177,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -200,10 +202,14 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 3a5fa1069b41..80b35314d7a9 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	1.0.5
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/1.0
diff --git a/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c
deleted file mode 100644
index 078542421129..000000000000
--- a/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Sun May  5 16:42:00 2002
-+++ libgnomevfs/gnome-vfs-utils.c	Sun May  5 16:42:15 2002
-@@ -771,7 +771,7 @@
- 	paths = g_strsplit (gnome_var, ":", 0); 
- 
- 	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
--		full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL);
-+		full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL);
- 		if (hack_file_exists (full_filename)) {
- 			g_strfreev (paths);
- 			return full_filename;
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 040fc697425a..e01ed0f54a4b 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.23 2007/03/10 05:33:01 marcus Exp $
+#   $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.25 2007/09/17 16:37:10 marcus Exp $
 #
 
 PORTNAME=	gnome-vfsmm
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo
index 7c4b659ed4c9..b70b4da67aa0 100644
--- a/devel/gnome-vfsmm/distinfo
+++ b/devel/gnome-vfsmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfsmm-2.18.0.tar.bz2) = 1c5c0ef2ffcf52e682375fa11facebbf
-SHA256 (gnome2/gnome-vfsmm-2.18.0.tar.bz2) = fd9a083db7d631666df2872e5d3b0a236e3116f417ee5fc116d64e0082f363a6
-SIZE (gnome2/gnome-vfsmm-2.18.0.tar.bz2) = 345525
+MD5 (gnome2/gnome-vfsmm-2.20.0.tar.bz2) = 3da9908850655031a383998d0cda1f85
+SHA256 (gnome2/gnome-vfsmm-2.20.0.tar.bz2) = 5a2cdeab177278ccb8b2e55eb257d332d57c750ba698b4199b7798b45afa7690
+SIZE (gnome2/gnome-vfsmm-2.20.0.tar.bz2) = 344213
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
index 1e5c964b094a..653996967706 100644
--- a/devel/gnome2-hacker-tools/Makefile
+++ b/devel/gnome2-hacker-tools/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.42 2006/10/14 06:29:06 ahze Exp $
+#   $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.45 2007/09/19 23:27:28 marcus Exp $
 #
 
 PORTREVISION=	0
@@ -21,7 +21,8 @@ RUN_DEPENDS=	mlview:${PORTSDIR}/editors/mlview \
 		meld:${PORTSDIR}/textproc/meld \
 		gtranslator:${PORTSDIR}/devel/gtranslator \
 		regexxer:${PORTSDIR}/devel/regexxer \
-		anjuta:${PORTSDIR}/devel/anjuta
+		anjuta:${PORTSDIR}/devel/anjuta \
+		accerciser:${PORTSDIR}/accessibility/accerciser
 
 MASTERDIR=	${.CURDIR}/../../x11/gnome2
 GNOME_SLAVE=	yes
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 99c739265cb9..79a6b1f8a549 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -3,12 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/goffice/Makefile,v 1.23 2007/03/11 20:02:56 mezz Exp $
+#   $MCom: ports/devel/goffice/Makefile,v 1.32 2007/09/06 05:01:28 marcus Exp $
 #
 # !!! When updating goffice, don't forget to update science/gchempaint pkg-plists too! !!!
 
 PORTNAME=	goffice
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist
index 3c0fd39f6656..d74849541cd1 100644
--- a/devel/goffice/pkg-plist
+++ b/devel/goffice/pkg-plist
@@ -290,130 +290,22 @@ libdata/pkgconfig/libgoffice-0.4.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/goffice/%%VERSION%%/glade/go-font-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-format-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-image-save-dialog-extra.glade
-share/gnome/goffice/%%VERSION%%/glade/go-rotation-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-graph-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-object-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-plot-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-series-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-style-prefs.glade
-share/gnome/goffice/%%VERSION%%/patterns/svg-patterns.xml
-share/gnome/pixmaps/goffice/%%VERSION%%/area.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hboth.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hminus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hplus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-none.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vboth.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vminus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vplus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/boxplot.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/bubble.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/color.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/column.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/doughnut.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/dropbar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/hist.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/linegraph.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/minmax.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/pie.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/polar.png
-share/gnome/pixmaps/goffice/%%VERSION%%/radar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/scatter.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/stock.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/surface.xpm
+%%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade
+%%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-guru-type-selector.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-guru.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-object-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-plot-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-reg-curve-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-series-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-style-prefs.glade
+%%DATADIR%%/%%VERSION%%/patterns/svg-patterns.xml
 share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
@@ -458,16 +350,120 @@ share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrm share/gnome/pixmaps/goffice/%%VERSION%%
-@dirrm share/gnome/pixmaps/goffice
-@dirrm share/gnome/goffice/%%VERSION%%/patterns
-@dirrm share/gnome/goffice/%%VERSION%%/glade
-@dirrm share/gnome/goffice/%%VERSION%%
-@dirrm share/gnome/goffice
+share/pixmaps/goffice/%%VERSION%%/area.xpm
+share/pixmaps/goffice/%%VERSION%%/bar-hboth.png
+share/pixmaps/goffice/%%VERSION%%/bar-hminus.png
+share/pixmaps/goffice/%%VERSION%%/bar-hplus.png
+share/pixmaps/goffice/%%VERSION%%/bar-none.png
+share/pixmaps/goffice/%%VERSION%%/bar-vboth.png
+share/pixmaps/goffice/%%VERSION%%/bar-vminus.png
+share/pixmaps/goffice/%%VERSION%%/bar-vplus.png
+share/pixmaps/goffice/%%VERSION%%/bar.xpm
+share/pixmaps/goffice/%%VERSION%%/boxplot.xpm
+share/pixmaps/goffice/%%VERSION%%/bubble.xpm
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
+share/pixmaps/goffice/%%VERSION%%/color.xpm
+share/pixmaps/goffice/%%VERSION%%/column.xpm
+share/pixmaps/goffice/%%VERSION%%/doughnut.xpm
+share/pixmaps/goffice/%%VERSION%%/dropbar.xpm
+share/pixmaps/goffice/%%VERSION%%/hist.xpm
+share/pixmaps/goffice/%%VERSION%%/linegraph.xpm
+share/pixmaps/goffice/%%VERSION%%/minmax.xpm
+share/pixmaps/goffice/%%VERSION%%/pie.xpm
+share/pixmaps/goffice/%%VERSION%%/polar.png
+share/pixmaps/goffice/%%VERSION%%/radar.xpm
+share/pixmaps/goffice/%%VERSION%%/scatter.xpm
+share/pixmaps/goffice/%%VERSION%%/stock.xpm
+share/pixmaps/goffice/%%VERSION%%/surface.xpm
+@dirrm share/pixmaps/goffice/%%VERSION%%
+@dirrm share/pixmaps/goffice
+@dirrm %%DATADIR%%/%%VERSION%%/patterns
+@dirrm %%DATADIR%%/%%VERSION%%/glade
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @dirrm lib/goffice/%%VERSION%%/plugins/smoothing
 @dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit
@@ -493,3 +489,7 @@ share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
 @dirrm include/libgoffice-0.4/goffice/app
 @dirrm include/libgoffice-0.4/goffice
 @dirrm include/libgoffice-0.4
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile
index 99c739265cb9..79a6b1f8a549 100644
--- a/devel/goffice04/Makefile
+++ b/devel/goffice04/Makefile
@@ -3,12 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/goffice/Makefile,v 1.23 2007/03/11 20:02:56 mezz Exp $
+#   $MCom: ports/devel/goffice/Makefile,v 1.32 2007/09/06 05:01:28 marcus Exp $
 #
 # !!! When updating goffice, don't forget to update science/gchempaint pkg-plists too! !!!
 
 PORTNAME=	goffice
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/goffice04/pkg-plist b/devel/goffice04/pkg-plist
index 3c0fd39f6656..d74849541cd1 100644
--- a/devel/goffice04/pkg-plist
+++ b/devel/goffice04/pkg-plist
@@ -290,130 +290,22 @@ libdata/pkgconfig/libgoffice-0.4.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/goffice/%%VERSION%%/glade/go-font-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-format-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-image-save-dialog-extra.glade
-share/gnome/goffice/%%VERSION%%/glade/go-rotation-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-graph-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-object-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-plot-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-series-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-style-prefs.glade
-share/gnome/goffice/%%VERSION%%/patterns/svg-patterns.xml
-share/gnome/pixmaps/goffice/%%VERSION%%/area.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hboth.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hminus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hplus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-none.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vboth.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vminus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vplus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/boxplot.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/bubble.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/color.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/column.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/doughnut.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/dropbar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/hist.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/linegraph.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/minmax.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/pie.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/polar.png
-share/gnome/pixmaps/goffice/%%VERSION%%/radar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/scatter.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/stock.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/surface.xpm
+%%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade
+%%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-guru-type-selector.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-guru.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-object-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-plot-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-reg-curve-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-series-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-style-prefs.glade
+%%DATADIR%%/%%VERSION%%/patterns/svg-patterns.xml
 share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
@@ -458,16 +350,120 @@ share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrm share/gnome/pixmaps/goffice/%%VERSION%%
-@dirrm share/gnome/pixmaps/goffice
-@dirrm share/gnome/goffice/%%VERSION%%/patterns
-@dirrm share/gnome/goffice/%%VERSION%%/glade
-@dirrm share/gnome/goffice/%%VERSION%%
-@dirrm share/gnome/goffice
+share/pixmaps/goffice/%%VERSION%%/area.xpm
+share/pixmaps/goffice/%%VERSION%%/bar-hboth.png
+share/pixmaps/goffice/%%VERSION%%/bar-hminus.png
+share/pixmaps/goffice/%%VERSION%%/bar-hplus.png
+share/pixmaps/goffice/%%VERSION%%/bar-none.png
+share/pixmaps/goffice/%%VERSION%%/bar-vboth.png
+share/pixmaps/goffice/%%VERSION%%/bar-vminus.png
+share/pixmaps/goffice/%%VERSION%%/bar-vplus.png
+share/pixmaps/goffice/%%VERSION%%/bar.xpm
+share/pixmaps/goffice/%%VERSION%%/boxplot.xpm
+share/pixmaps/goffice/%%VERSION%%/bubble.xpm
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
+share/pixmaps/goffice/%%VERSION%%/color.xpm
+share/pixmaps/goffice/%%VERSION%%/column.xpm
+share/pixmaps/goffice/%%VERSION%%/doughnut.xpm
+share/pixmaps/goffice/%%VERSION%%/dropbar.xpm
+share/pixmaps/goffice/%%VERSION%%/hist.xpm
+share/pixmaps/goffice/%%VERSION%%/linegraph.xpm
+share/pixmaps/goffice/%%VERSION%%/minmax.xpm
+share/pixmaps/goffice/%%VERSION%%/pie.xpm
+share/pixmaps/goffice/%%VERSION%%/polar.png
+share/pixmaps/goffice/%%VERSION%%/radar.xpm
+share/pixmaps/goffice/%%VERSION%%/scatter.xpm
+share/pixmaps/goffice/%%VERSION%%/stock.xpm
+share/pixmaps/goffice/%%VERSION%%/surface.xpm
+@dirrm share/pixmaps/goffice/%%VERSION%%
+@dirrm share/pixmaps/goffice
+@dirrm %%DATADIR%%/%%VERSION%%/patterns
+@dirrm %%DATADIR%%/%%VERSION%%/glade
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @dirrm lib/goffice/%%VERSION%%/plugins/smoothing
 @dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit
@@ -493,3 +489,7 @@ share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
 @dirrm include/libgoffice-0.4/goffice/app
 @dirrm include/libgoffice-0.4/goffice
 @dirrm include/libgoffice-0.4
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile
index 3a904a6ec6fa..225ba2c8af21 100644
--- a/devel/goffice1/Makefile
+++ b/devel/goffice1/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/goffice/Makefile,v 1.9 2006/01/31 22:13:22 ahze Exp $
+#   $MCom: ports/devel/goffice1/Makefile,v 1.1 2007/07/23 21:36:19 mezz Exp $
 #
 
 PORTNAME=	goffice
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
diff --git a/devel/goffice1/pkg-plist b/devel/goffice1/pkg-plist
index 2bfccab98f8f..313ef9597c8b 100644
--- a/devel/goffice1/pkg-plist
+++ b/devel/goffice1/pkg-plist
@@ -174,116 +174,116 @@ lib/libgoffice-1.la
 lib/libgoffice-1.so
 lib/libgoffice-1.so.2
 libdata/pkgconfig/libgoffice-1.pc
-share/gnome/goffice/%%VERSION%%/glade/go-font-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-format-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-rotation-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-chart-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-object-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-style-prefs.glade
-share/gnome/goffice/%%VERSION%%/patterns/svg-patterns.xml
-share/gnome/pixmaps/goffice/area.xpm
-share/gnome/pixmaps/goffice/bar-hboth.png
-share/gnome/pixmaps/goffice/bar-hminus.png
-share/gnome/pixmaps/goffice/bar-hplus.png
-share/gnome/pixmaps/goffice/bar-none.png
-share/gnome/pixmaps/goffice/bar-vboth.png
-share/gnome/pixmaps/goffice/bar-vminus.png
-share/gnome/pixmaps/goffice/bar-vplus.png
-share/gnome/pixmaps/goffice/bar.xpm
-share/gnome/pixmaps/goffice/boxplot.xpm
-share/gnome/pixmaps/goffice/bubble.xpm
-share/gnome/pixmaps/goffice/chart_area_1_1.png
-share/gnome/pixmaps/goffice/chart_area_1_2.png
-share/gnome/pixmaps/goffice/chart_area_1_3.png
-share/gnome/pixmaps/goffice/chart_bar_1_1.png
-share/gnome/pixmaps/goffice/chart_bar_1_2.png
-share/gnome/pixmaps/goffice/chart_bar_1_3.png
-share/gnome/pixmaps/goffice/chart_bar_2_1.png
-share/gnome/pixmaps/goffice/chart_bar_2_2.png
-share/gnome/pixmaps/goffice/chart_bar_2_3.png
-share/gnome/pixmaps/goffice/chart_boxplot_1_1.png
-share/gnome/pixmaps/goffice/chart_bubble_1_1.png
-share/gnome/pixmaps/goffice/chart_column_1_1.png
-share/gnome/pixmaps/goffice/chart_column_1_2.png
-share/gnome/pixmaps/goffice/chart_column_1_3.png
-share/gnome/pixmaps/goffice/chart_column_2_1.png
-share/gnome/pixmaps/goffice/chart_column_2_2.png
-share/gnome/pixmaps/goffice/chart_column_2_3.png
-share/gnome/pixmaps/goffice/chart_column_3_1.png
-share/gnome/pixmaps/goffice/chart_cone_1_1.png
-share/gnome/pixmaps/goffice/chart_cone_1_2.png
-share/gnome/pixmaps/goffice/chart_cone_1_3.png
-share/gnome/pixmaps/goffice/chart_cone_2_1.png
-share/gnome/pixmaps/goffice/chart_cone_2_2.png
-share/gnome/pixmaps/goffice/chart_cone_2_3.png
-share/gnome/pixmaps/goffice/chart_cone_3_1.png
-share/gnome/pixmaps/goffice/chart_contour_1_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_2.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_3.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_2.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_3.png
-share/gnome/pixmaps/goffice/chart_cylinder_3_1.png
-share/gnome/pixmaps/goffice/chart_dropbar_1_1.png
-share/gnome/pixmaps/goffice/chart_dropbar_1_2.png
-share/gnome/pixmaps/goffice/chart_line_1_1.png
-share/gnome/pixmaps/goffice/chart_line_1_2.png
-share/gnome/pixmaps/goffice/chart_line_1_3.png
-share/gnome/pixmaps/goffice/chart_line_2_1.png
-share/gnome/pixmaps/goffice/chart_line_2_2.png
-share/gnome/pixmaps/goffice/chart_line_2_3.png
-share/gnome/pixmaps/goffice/chart_line_3_1.png
-share/gnome/pixmaps/goffice/chart_minmax_1_1.png
-share/gnome/pixmaps/goffice/chart_minmax_1_2.png
-share/gnome/pixmaps/goffice/chart_minmax_2_1.png
-share/gnome/pixmaps/goffice/chart_minmax_2_2.png
-share/gnome/pixmaps/goffice/chart_pie_1_1.png
-share/gnome/pixmaps/goffice/chart_pie_1_2.png
-share/gnome/pixmaps/goffice/chart_pie_1_3.png
-share/gnome/pixmaps/goffice/chart_pie_2_1.png
-share/gnome/pixmaps/goffice/chart_pie_2_2.png
-share/gnome/pixmaps/goffice/chart_pie_2_3.png
-share/gnome/pixmaps/goffice/chart_polar_1_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_2.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_3.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_2.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_3.png
-share/gnome/pixmaps/goffice/chart_pyramid_3_1.png
-share/gnome/pixmaps/goffice/chart_radar_1_1.png
-share/gnome/pixmaps/goffice/chart_radar_1_2.png
-share/gnome/pixmaps/goffice/chart_radar_1_3.png
-share/gnome/pixmaps/goffice/chart_ring_1_1.png
-share/gnome/pixmaps/goffice/chart_ring_1_2.png
-share/gnome/pixmaps/goffice/chart_scatter_1_1.png
-share/gnome/pixmaps/goffice/chart_scatter_2_1.png
-share/gnome/pixmaps/goffice/chart_scatter_2_2.png
-share/gnome/pixmaps/goffice/chart_scatter_3_1.png
-share/gnome/pixmaps/goffice/chart_scatter_3_2.png
-share/gnome/pixmaps/goffice/chart_scatter_3_3.png
-share/gnome/pixmaps/goffice/chart_stock_1_1.png
-share/gnome/pixmaps/goffice/chart_stock_1_2.png
-share/gnome/pixmaps/goffice/chart_stock_2_1.png
-share/gnome/pixmaps/goffice/chart_stock_2_2.png
-share/gnome/pixmaps/goffice/column.xpm
-share/gnome/pixmaps/goffice/doughnut.xpm
-share/gnome/pixmaps/goffice/dropbar.xpm
-share/gnome/pixmaps/goffice/linegraph.xpm
-share/gnome/pixmaps/goffice/minmax.xpm
-share/gnome/pixmaps/goffice/pie.xpm
-share/gnome/pixmaps/goffice/polar.png
-share/gnome/pixmaps/goffice/radar.xpm
-share/gnome/pixmaps/goffice/scatter.xpm
-share/gnome/pixmaps/goffice/stock.xpm
-share/gnome/pixmaps/goffice/surface.xpm
+share/goffice/%%VERSION%%/glade/go-font-sel.glade
+share/goffice/%%VERSION%%/glade/go-format-sel.glade
+share/goffice/%%VERSION%%/glade/go-rotation-sel.glade
+share/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-chart-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
+share/goffice/%%VERSION%%/glade/gog-guru.glade
+share/goffice/%%VERSION%%/glade/gog-object-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-style-prefs.glade
+share/goffice/%%VERSION%%/patterns/svg-patterns.xml
+share/pixmaps/goffice/area.xpm
+share/pixmaps/goffice/bar-hboth.png
+share/pixmaps/goffice/bar-hminus.png
+share/pixmaps/goffice/bar-hplus.png
+share/pixmaps/goffice/bar-none.png
+share/pixmaps/goffice/bar-vboth.png
+share/pixmaps/goffice/bar-vminus.png
+share/pixmaps/goffice/bar-vplus.png
+share/pixmaps/goffice/bar.xpm
+share/pixmaps/goffice/boxplot.xpm
+share/pixmaps/goffice/bubble.xpm
+share/pixmaps/goffice/chart_area_1_1.png
+share/pixmaps/goffice/chart_area_1_2.png
+share/pixmaps/goffice/chart_area_1_3.png
+share/pixmaps/goffice/chart_bar_1_1.png
+share/pixmaps/goffice/chart_bar_1_2.png
+share/pixmaps/goffice/chart_bar_1_3.png
+share/pixmaps/goffice/chart_bar_2_1.png
+share/pixmaps/goffice/chart_bar_2_2.png
+share/pixmaps/goffice/chart_bar_2_3.png
+share/pixmaps/goffice/chart_boxplot_1_1.png
+share/pixmaps/goffice/chart_bubble_1_1.png
+share/pixmaps/goffice/chart_column_1_1.png
+share/pixmaps/goffice/chart_column_1_2.png
+share/pixmaps/goffice/chart_column_1_3.png
+share/pixmaps/goffice/chart_column_2_1.png
+share/pixmaps/goffice/chart_column_2_2.png
+share/pixmaps/goffice/chart_column_2_3.png
+share/pixmaps/goffice/chart_column_3_1.png
+share/pixmaps/goffice/chart_cone_1_1.png
+share/pixmaps/goffice/chart_cone_1_2.png
+share/pixmaps/goffice/chart_cone_1_3.png
+share/pixmaps/goffice/chart_cone_2_1.png
+share/pixmaps/goffice/chart_cone_2_2.png
+share/pixmaps/goffice/chart_cone_2_3.png
+share/pixmaps/goffice/chart_cone_3_1.png
+share/pixmaps/goffice/chart_contour_1_1.png
+share/pixmaps/goffice/chart_cylinder_1_1.png
+share/pixmaps/goffice/chart_cylinder_1_2.png
+share/pixmaps/goffice/chart_cylinder_1_3.png
+share/pixmaps/goffice/chart_cylinder_2_1.png
+share/pixmaps/goffice/chart_cylinder_2_2.png
+share/pixmaps/goffice/chart_cylinder_2_3.png
+share/pixmaps/goffice/chart_cylinder_3_1.png
+share/pixmaps/goffice/chart_dropbar_1_1.png
+share/pixmaps/goffice/chart_dropbar_1_2.png
+share/pixmaps/goffice/chart_line_1_1.png
+share/pixmaps/goffice/chart_line_1_2.png
+share/pixmaps/goffice/chart_line_1_3.png
+share/pixmaps/goffice/chart_line_2_1.png
+share/pixmaps/goffice/chart_line_2_2.png
+share/pixmaps/goffice/chart_line_2_3.png
+share/pixmaps/goffice/chart_line_3_1.png
+share/pixmaps/goffice/chart_minmax_1_1.png
+share/pixmaps/goffice/chart_minmax_1_2.png
+share/pixmaps/goffice/chart_minmax_2_1.png
+share/pixmaps/goffice/chart_minmax_2_2.png
+share/pixmaps/goffice/chart_pie_1_1.png
+share/pixmaps/goffice/chart_pie_1_2.png
+share/pixmaps/goffice/chart_pie_1_3.png
+share/pixmaps/goffice/chart_pie_2_1.png
+share/pixmaps/goffice/chart_pie_2_2.png
+share/pixmaps/goffice/chart_pie_2_3.png
+share/pixmaps/goffice/chart_polar_1_1.png
+share/pixmaps/goffice/chart_pyramid_1_1.png
+share/pixmaps/goffice/chart_pyramid_1_2.png
+share/pixmaps/goffice/chart_pyramid_1_3.png
+share/pixmaps/goffice/chart_pyramid_2_1.png
+share/pixmaps/goffice/chart_pyramid_2_2.png
+share/pixmaps/goffice/chart_pyramid_2_3.png
+share/pixmaps/goffice/chart_pyramid_3_1.png
+share/pixmaps/goffice/chart_radar_1_1.png
+share/pixmaps/goffice/chart_radar_1_2.png
+share/pixmaps/goffice/chart_radar_1_3.png
+share/pixmaps/goffice/chart_ring_1_1.png
+share/pixmaps/goffice/chart_ring_1_2.png
+share/pixmaps/goffice/chart_scatter_1_1.png
+share/pixmaps/goffice/chart_scatter_2_1.png
+share/pixmaps/goffice/chart_scatter_2_2.png
+share/pixmaps/goffice/chart_scatter_3_1.png
+share/pixmaps/goffice/chart_scatter_3_2.png
+share/pixmaps/goffice/chart_scatter_3_3.png
+share/pixmaps/goffice/chart_stock_1_1.png
+share/pixmaps/goffice/chart_stock_1_2.png
+share/pixmaps/goffice/chart_stock_2_1.png
+share/pixmaps/goffice/chart_stock_2_2.png
+share/pixmaps/goffice/column.xpm
+share/pixmaps/goffice/doughnut.xpm
+share/pixmaps/goffice/dropbar.xpm
+share/pixmaps/goffice/linegraph.xpm
+share/pixmaps/goffice/minmax.xpm
+share/pixmaps/goffice/pie.xpm
+share/pixmaps/goffice/polar.png
+share/pixmaps/goffice/radar.xpm
+share/pixmaps/goffice/scatter.xpm
+share/pixmaps/goffice/stock.xpm
+share/pixmaps/goffice/surface.xpm
 share/locale/am/LC_MESSAGES/goffice.mo
 share/locale/az/LC_MESSAGES/goffice.mo
 share/locale/bg/LC_MESSAGES/goffice.mo
@@ -328,13 +328,11 @@ share/locale/uk/LC_MESSAGES/goffice.mo
 share/locale/vi/LC_MESSAGES/goffice.mo
 share/locale/zh_CN/LC_MESSAGES/goffice.mo
 share/locale/zh_TW/LC_MESSAGES/goffice.mo
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrm share/gnome/pixmaps/goffice
-@dirrm share/gnome/goffice/%%VERSION%%/patterns
-@dirrm share/gnome/goffice/%%VERSION%%/glade
-@dirrm share/gnome/goffice/%%VERSION%%
-@dirrm share/gnome/goffice
+@dirrm share/pixmaps/goffice
+@dirrm share/goffice/%%VERSION%%/patterns
+@dirrm share/goffice/%%VERSION%%/glade
+@dirrm share/goffice/%%VERSION%%
+@dirrm share/goffice
 @dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit
 @dirrm lib/goffice/%%VERSION%%/plugins/reg_linear
 @dirrm lib/goffice/%%VERSION%%/plugins/plot_xy
@@ -358,3 +356,5 @@ share/locale/zh_TW/LC_MESSAGES/goffice.mo
 @dirrm include/libgoffice-1/goffice/app
 @dirrm include/libgoffice-1/goffice
 @dirrm include/libgoffice-1
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index a1b3fa0c9d49..97ef9b0ef52b 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/devel/gtranslator/Makefile,v 1.12 2007/07/04 15:52:37 mezz Exp $
 #
 
 PORTNAME=	gtranslator
 PORTVERSION=	1.1.7
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gtranslator/pkg-plist b/devel/gtranslator/pkg-plist
index 88ce57480ed4..842258d4c5ea 100644
--- a/devel/gtranslator/pkg-plist
+++ b/devel/gtranslator/pkg-plist
@@ -1,46 +1,36 @@
 bin/gtranslator
 bin/pozilla.sh
-share/gnome/applications/gtranslator.desktop
-share/gnome/gtranslator/colorschemes/arek.xml
-share/gnome/gtranslator/colorschemes/boom-boom.xml
-share/gnome/gtranslator/colorschemes/clean.xml
-share/gnome/gtranslator/colorschemes/curlymonster.xml
-share/gnome/gtranslator/colorschemes/default.xml
-share/gnome/gtranslator/colorschemes/extremely-kabalak.xml
-share/gnome/gtranslator/colorschemes/kabalak.xml
-share/gnome/gtranslator/colorschemes/kbabel.xml
-share/gnome/gtranslator/colorschemes/menesis.xml
-share/gnome/gtranslator/colorschemes/mmc.xml
-share/gnome/gtranslator/colorschemes/nizuu.xml
-share/gnome/gtranslator/colorschemes/pdmc.xml
-share/gnome/gtranslator/colorschemes/sepia.xml
-share/gnome/gtranslator/colorschemes/spiffE.xml
-share/gnome/gtranslator/colorschemes/thinice.xml
-share/gnome/gtranslator/colorschemes/toyfactory.xml
-share/gnome/gtranslator/colorschemes/tuey.xml
-share/gnome/gtranslator/colorschemes/vim.xml
-share/gnome/gtranslator/colorschemes/waliays.xml
-share/gnome/gtranslator/colorschemes/yef.xml
-share/gnome/gtranslator/colorschemes/zuper.xml
-share/gnome/gtranslator/dtd/umtf.dtd
-share/gnome/gtranslator/scripts/build-gtranslator-learn-buffer.sh
-share/gnome/gtranslator/scripts/cleanup-gtranslator-settings.sh
-share/gnome/gtranslator/scripts/my-update.sh
+share/applications/gtranslator.desktop
 share/gnome/help/gtranslator/C/figures/mainwindow.png
 share/gnome/help/gtranslator/C/figures/prefs.png
 share/gnome/help/gtranslator/C/figures/toolbar.png
 share/gnome/help/gtranslator/C/gtranslator.xml
 share/gnome/help/gtranslator/C/legal.xml
-share/gnome/mime-info/gtranslator.keys
-share/gnome/mime-info/gtranslator.mime
-share/gnome/omf/gtranslator/gtranslator-C.omf
-share/gnome/pixmaps/gnome-application-x-gmo.png
-share/gnome/pixmaps/gnome-application-x-po.png
-share/gnome/pixmaps/gtranslator.png
-share/gnome/pixmaps/gtranslator/fuzzy.png
-share/gnome/pixmaps/gtranslator/fuzzy_small.png
-share/gnome/pixmaps/gtranslator/untranslated.png
-share/gnome/pixmaps/gtranslator/untranslated_small.png
+%%DATADIR%%/colorschemes/arek.xml
+%%DATADIR%%/colorschemes/boom-boom.xml
+%%DATADIR%%/colorschemes/clean.xml
+%%DATADIR%%/colorschemes/curlymonster.xml
+%%DATADIR%%/colorschemes/default.xml
+%%DATADIR%%/colorschemes/extremely-kabalak.xml
+%%DATADIR%%/colorschemes/kabalak.xml
+%%DATADIR%%/colorschemes/kbabel.xml
+%%DATADIR%%/colorschemes/menesis.xml
+%%DATADIR%%/colorschemes/mmc.xml
+%%DATADIR%%/colorschemes/nizuu.xml
+%%DATADIR%%/colorschemes/pdmc.xml
+%%DATADIR%%/colorschemes/sepia.xml
+%%DATADIR%%/colorschemes/spiffE.xml
+%%DATADIR%%/colorschemes/thinice.xml
+%%DATADIR%%/colorschemes/toyfactory.xml
+%%DATADIR%%/colorschemes/tuey.xml
+%%DATADIR%%/colorschemes/vim.xml
+%%DATADIR%%/colorschemes/waliays.xml
+%%DATADIR%%/colorschemes/yef.xml
+%%DATADIR%%/colorschemes/zuper.xml
+%%DATADIR%%/dtd/umtf.dtd
+%%DATADIR%%/scripts/build-gtranslator-learn-buffer.sh
+%%DATADIR%%/scripts/cleanup-gtranslator-settings.sh
+%%DATADIR%%/scripts/my-update.sh
 share/locale/am/LC_MESSAGES/gtranslator.mo
 share/locale/az/LC_MESSAGES/gtranslator.mo
 share/locale/be/LC_MESSAGES/gtranslator.mo
@@ -92,12 +82,23 @@ share/locale/vi/LC_MESSAGES/gtranslator.mo
 share/locale/wa/LC_MESSAGES/gtranslator.mo
 share/locale/zh_CN/LC_MESSAGES/gtranslator.mo
 share/locale/zh_TW/LC_MESSAGES/gtranslator.mo
-@dirrm share/gnome/pixmaps/gtranslator
-@dirrm share/gnome/omf/gtranslator
+share/mime-info/gtranslator.keys
+share/mime-info/gtranslator.mime
+share/omf/gtranslator/gtranslator-C.omf
+share/pixmaps/gnome-application-x-gmo.png
+share/pixmaps/gnome-application-x-po.png
+share/pixmaps/gtranslator.png
+share/pixmaps/gtranslator/fuzzy.png
+share/pixmaps/gtranslator/fuzzy_small.png
+share/pixmaps/gtranslator/untranslated.png
+share/pixmaps/gtranslator/untranslated_small.png
+@dirrm share/pixmaps/gtranslator
+@dirrm share/omf/gtranslator
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/dtd
+@dirrm %%DATADIR%%/colorschemes
+@dirrm %%DATADIR%%
 @dirrm share/gnome/help/gtranslator/C/figures
 @dirrm share/gnome/help/gtranslator/C
 @dirrm share/gnome/help/gtranslator
-@dirrm share/gnome/gtranslator/scripts
-@dirrm share/gnome/gtranslator/dtd
-@dirrm share/gnome/gtranslator/colorschemes
-@dirrm share/gnome/gtranslator
+@dirrmtry share/applications
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index 05c5d8bd217e..338f12d6671b 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guikachu
 PORTVERSION=	1.5.10
-PORTEPOCH=	2
+PORTEPOCH=	3
 CATEGORIES=	devel palm gnome
 MASTER_SITES=	http://cactus.rulez.org/projects/guikachu/download/
 
diff --git a/devel/guikachu/pkg-plist b/devel/guikachu/pkg-plist
index 82cdac32dc4b..75e94b176cc6 100644
--- a/devel/guikachu/pkg-plist
+++ b/devel/guikachu/pkg-plist
@@ -1,7 +1,7 @@
 bin/guikachu
 bin/guikachu2rcp
-share/gnome/application-registry/guikachu.applications
-share/gnome/applications/guikachu.desktop
+share/application-registry/guikachu.applications
+share/applications/guikachu.desktop
 share/gnome/help/guikachu/C/bitmaps.html
 share/gnome/help/guikachu/C/form-editor.html
 share/gnome/help/guikachu/C/guikachu-doc-html.css
@@ -34,9 +34,9 @@ share/gnome/help/guikachu/C/resource-win.html
 share/gnome/help/guikachu/C/resources.html
 share/gnome/help/guikachu/C/using.html
 share/gnome/help/guikachu/C/widgets.html
-share/gnome/pixmaps/guikachu-96.png
-share/gnome/pixmaps/guikachu-application-x-guikachu-96.png
-share/gnome/pixmaps/guikachu.png
+share/pixmaps/guikachu-96.png
+share/pixmaps/guikachu-application-x-guikachu-96.png
+share/pixmaps/guikachu.png
 share/locale/az/LC_MESSAGES/guikachu.mo
 share/locale/ca/LC_MESSAGES/guikachu.mo
 share/locale/cs/LC_MESSAGES/guikachu.mo
@@ -67,3 +67,4 @@ share/mime/packages/guikachu.mime.xml
 @dirrm share/gnome/help/guikachu
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index 64c502ec02ab..400335c2fb0f 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libassetml
 PORTVERSION=	1.2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ofset
@@ -31,6 +31,6 @@ CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 INFO=	libassetml
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/gnome/assetml
+	@${MKDIR} ${PREFIX}/share/assetml
 
 .include <bsd.port.mk>
diff --git a/devel/libassetml/files/patch-configure b/devel/libassetml/files/patch-configure
deleted file mode 100644
index 788ddabbd4a5..000000000000
--- a/devel/libassetml/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Dec  4 12:51:13 2003
-+++ configure	Thu Dec  4 12:52:04 2003
-@@ -11645,7 +11646,7 @@
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define ASSETML_DIR "${myprefix}/${DATADIRNAME}/${ASSETML_DIR}"
-+#define ASSETML_DIR "${myprefix}/${DATADIRNAME}/gnome/${ASSETML_DIR}"
- _ACEOF
- 
- 
diff --git a/devel/libassetml/pkg-plist b/devel/libassetml/pkg-plist
index 7f12dfb114be..d40c251e75e6 100644
--- a/devel/libassetml/pkg-plist
+++ b/devel/libassetml/pkg-plist
@@ -10,9 +10,9 @@ share/gnome/help/libassetml/C/topic.dat
 share/locale/fr/LC_MESSAGES/libassetml.mo
 share/locale/it/LC_MESSAGES/libassetml.mo
 share/locale/ja/LC_MESSAGES/libassetml.mo
-@exec /bin/mkdir -p %D/share/gnome/assetml
+@exec /bin/mkdir -p %D/share/assetml
 @dirrm share/gnome/help/libassetml/C
 @dirrm share/gnome/help/libassetml
-@unexec /bin/rmdir %D/share/gnome/assetml 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/assetml 2>/dev/null || /usr/bin/true
 @dirrm include/libassetml-1.0/libassetml
 @dirrm include/libassetml-1.0
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 5523bf9dcc41..94f410188a13 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/devel/libbonobo/Makefile,v 1.58 2007/03/12 17:59:36 marcus Exp $
+#    $MCom: ports/devel/libbonobo/Makefile,v 1.67 2007/10/17 21:36:11 mezz Exp $
 #
 
 PORTNAME=	libbonobo
-PORTVERSION=	2.18.0
-PORTREVISION?=	2
+PORTVERSION=	2.20.1
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 9e0d3cfa4be4..184b35bdadf5 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonobo-2.18.0.tar.bz2) = 8f0676e63420abf622f799cdd24ed9cc
-SHA256 (gnome2/libbonobo-2.18.0.tar.bz2) = 55b37d7863683d6947bdff6da7caec9ddd8a8001aac3e97a7b9d5e91898685aa
-SIZE (gnome2/libbonobo-2.18.0.tar.bz2) = 1441461
+MD5 (gnome2/libbonobo-2.20.1.tar.bz2) = 76e52d1c39e6ef1079c757c21f06f5ff
+SHA256 (gnome2/libbonobo-2.20.1.tar.bz2) = ff64d8e1acf6fdaa68980f7969e3f8b88d6c196d28f8fb9342d951c8c4a98c70
+SIZE (gnome2/libbonobo-2.20.1.tar.bz2) = 1447009
diff --git a/devel/libbonobo/files/patch-server::Makefile.in b/devel/libbonobo/files/patch-server::Makefile.in
index f07320f9b8a7..45fc8fc1e142 100644
--- a/devel/libbonobo/files/patch-server::Makefile.in
+++ b/devel/libbonobo/files/patch-server::Makefile.in
@@ -5,7 +5,7 @@
  	-I$(top_srcdir)/bonobo-activation	\
  	-DPREFIX=\""$(prefix)"\"		\
 -	-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers\" \
-+	-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${X11BASE}/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \
++	-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \
          -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
  	$(SERVER_CFLAGS)			\
  	-DSERVER_CONFDIR=\"$(sysconfdir)\"	\
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 2f472729718f..b129a88f9d6e 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -145,6 +145,7 @@ share/locale/nb/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ne/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/oc/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/or/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/pa/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo
@@ -160,6 +161,7 @@ share/locale/sr/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/th/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/vi/LC_MESSAGES/libbonobo-2.0.mo
@@ -190,6 +192,8 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
 @dirrmtry share/locale/xh
 @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
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index d370b97dbbc9..ec67a1faabf3 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.17
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libglade/0.17
diff --git a/devel/libglade/files/patch-ab b/devel/libglade/files/patch-ab
index 244d49bd8e05..e77bc4105efd 100644
--- a/devel/libglade/files/patch-ab
+++ b/devel/libglade/files/patch-ab
@@ -10,7 +10,7 @@ $FreeBSD$
 -SUBDIRS = intl macros glade doc
 +SUBDIRS = intl macros glade
  
- m4datadir = $(prefix)/share/aclocal
+ m4datadir = $(datadir)/aclocal
  m4data_DATA = libglade.m4
  
 -confexecdir = $(libdir)
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 6d13526f41e3..e2c6ee0eb239 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgtop/Makefile,v 1.5 2006/10/02 23:26:51 ahze Exp $
+#   $MCom: ports/devel/libgtop/Makefile,v 1.24 2007/09/16 17:22:25 ahze Exp $
 #
 
 PORTNAME=	libgtop
-PORTVERSION=	2.14.9
+PORTVERSION=	2.20.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,6 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 top library
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
+RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
 
 USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 9edde9205325..a0808660ecf5 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.14.9.tar.bz2) = a228ccab58216f7fef97de9c2b6e328e
-SHA256 (gnome2/libgtop-2.14.9.tar.bz2) = 6b10e1e416d823e7acf7e5665fda7547b1794b62789d8c2d73383fede2bad782
-SIZE (gnome2/libgtop-2.14.9.tar.bz2) = 772126
+MD5 (gnome2/libgtop-2.20.0.tar.bz2) = ddc05ffe9499294801cbd5fdac949045
+SHA256 (gnome2/libgtop-2.20.0.tar.bz2) = 5cae684d0af69193d9b6c31bbb90f74350855a23f245aef8538c17a877ba04a5
+SIZE (gnome2/libgtop-2.20.0.tar.bz2) = 766106
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index 73ea7de04db0..54b982f347b5 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -1,13 +1,13 @@
 bin/libgtop_daemon2
 bin/libgtop_server2
 include/libgtop-2.0/glibtop.h
+include/libgtop-2.0/glibtop_private.h
 include/libgtop-2.0/glibtop/close.h
 include/libgtop-2.0/glibtop/command.h
 include/libgtop-2.0/glibtop/cpu.h
 include/libgtop-2.0/glibtop/fsusage.h
 include/libgtop-2.0/glibtop/global.h
 include/libgtop-2.0/glibtop/gnuserv.h
-include/libgtop-2.0/glibtop/inodedb.h
 include/libgtop-2.0/glibtop/loadavg.h
 include/libgtop-2.0/glibtop/mem.h
 include/libgtop-2.0/glibt
author	lofi <lofi@FreeBSD.org>	2005-06-26 23:38:58 +0800
committer	lofi <lofi@FreeBSD.org>	2005-06-26 23:38:58 +0800
commit	8cd1837ecbc0bb30f0ee97e6b6f5886e8b02a92d (patch)
tree	918c137aff4fc4dc13581cf186d5289f068e5c7c /misc/kde3-i18n-ro
parent	7967f86d817b4102f6553a035e7d163843188d8a (diff)
download	freebsd-ports-gnome-8cd1837ecbc0bb30f0ee97e6b6f5886e8b02a92d.tar.gz freebsd-ports-gnome-8cd1837ecbc0bb30f0ee97e6b6f5886e8b02a92d.tar.zst freebsd-ports-gnome-8cd1837ecbc0bb30f0ee97e6b6f5886e8b02a92d.zip